diff options
| -rw-r--r-- | k8s-bootstrap-container/pom.xml | 2 | ||||
| -rw-r--r-- | pnda-bootstrap-container/Dockerfile | 4 | ||||
| -rw-r--r-- | pnda-mirror-container/Dockerfile | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml index 1af2a41..d40bb9d 100644 --- a/k8s-bootstrap-container/pom.xml +++ b/k8s-bootstrap-container/pom.xml @@ -27,7 +27,7 @@ limitations under the License. <groupId>org.onap.dcaegen2.deployments</groupId> <artifactId>k8s-bootstrap-container</artifactId> <name>dcaegen2-deployments-k8s-bootstrap-container</name> - <version>1.4.4</version> + <version>1.4.5</version> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/pnda-bootstrap-container/Dockerfile b/pnda-bootstrap-container/Dockerfile index 1b90d65..4fefa8a 100644 --- a/pnda-bootstrap-container/Dockerfile +++ b/pnda-bootstrap-container/Dockerfile @@ -18,8 +18,8 @@ FROM python:2.7.15 as build -ARG PNDACLITAG=2.0.0 -ARG PLATFORMSALTTAG=5.0.0 +ARG PNDACLITAG=release/5.0 +ARG PLATFORMSALTTAG=release/5.0 RUN git clone -b $PNDACLITAG https://github.com/pndaproject/pnda-cli.git RUN git clone -b $PLATFORMSALTTAG https://github.com/pndaproject/platform-salt.git diff --git a/pnda-mirror-container/Dockerfile b/pnda-mirror-container/Dockerfile index 3fdcfee..9891a15 100644 --- a/pnda-mirror-container/Dockerfile +++ b/pnda-mirror-container/Dockerfile @@ -18,24 +18,24 @@ FROM centos:7.5.1804 as build -ARG PNDARELEASE=develop +ARG PNDARELEASE=release/5.0 # Can be HDP or CDH ARG HADOOPDIST=HDP - RUN yum clean all && rm -rf /var/cache/yum/* && yum install gettext git -y RUN git clone -b $PNDARELEASE https://github.com/pndaproject/pnda.git WORKDIR /pnda/mirror -RUN ./create_mirror.sh HDP +# Add the -r flag to mirror rpm packages +RUN ./create_mirror.sh -d $HADOOPDIST -r WORKDIR /pnda/build RUN ./install-build-tools.sh RUN yum install bzip2 make which -y RUN source ./set-pnda-env.sh \ - && PARALLEL="--jobs 1" ./build-pnda.sh BRANCH $PNDARELEASE $HADOOPDIST + && PARALLEL="--jobs 1" ./build-pnda.sh RELEASE $PNDARELEASE $HADOOPDIST FROM nginx:alpine |