diff options
| author |   Vijay Venkatesh Kumar <vv770d@att.com> | 2018-10-29 22:04:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-29 22:04:22 +0000 |
| commit | d003b6e2876dc3b0ef125e90622964eaf8f3114a (patch) | |
| tree | 2bfb0d829739da9ae4bf2a7507c4895710939914 | |
| parent | 251ca1da04625ce590c08afe1be67e2c94bd150d (diff) | |
| parent | dbac6f26fe6e6a10ae87e06db6fef34afa402727 (diff) | |
Merge "Align PNDA build and deployment with release/5.0"
| -rw-r--r-- | pnda-bootstrap-container/Dockerfile | 4 | ||||
| -rw-r--r-- | pnda-mirror-container/Dockerfile | 8 |
2 files changed, 6 insertions, 6 deletions
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 |