diff options
| author |   Jonathan Gathman <jonathan.gathman@att.com> | 2019-03-27 18:00:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-27 18:00:50 +0000 |
| commit | 1cbfaa9d856d5d5dae37f7b8cf412cc6839f84ee (patch) | |
| tree | 7fe34ae494274d354dd06dbff815d08bc3a9afa5 /auth/auth-cass | |
| parent | 62ed4c99b099ae4fd9492e80fb2975bf328e48f4 (diff) | |
| parent | d6bda193a97691213b20ea3c5b29a591d46a4641 (diff) | |
Merge "support multi-platform docker builds"
Diffstat (limited to 'auth/auth-cass')
| -rw-r--r-- | auth/auth-cass/docker/Dockerfile.cass | 9 | ||||
| -rw-r--r-- | auth/auth-cass/docker/dbuild.sh | 13 |
2 files changed, 15 insertions, 7 deletions
diff --git a/auth/auth-cass/docker/Dockerfile.cass b/auth/auth-cass/docker/Dockerfile.cass index f842a962..52aa49c8 100644 --- a/auth/auth-cass/docker/Dockerfile.cass +++ b/auth/auth-cass/docker/Dockerfile.cass @@ -17,9 +17,8 @@ # limitations under the License. # ============LICENSE_END==================================================== # -# public, multi-platform base image -FROM nexus3.onap.org:10001/cassandra:3.11 -# FROM cassandra:3.11 +# Use dbuild.sh input parameter to set registry +FROM ${REGISTRY}cassandra:3.11 MAINTAINER AAF Team, AT&T 2018 ENV VERSION=${AAF_VERSION} @@ -33,8 +32,8 @@ COPY aaf-auth-batch-${AAF_VERSION}-full.jar /opt/app/aaf/cass_init/ COPY cass_data/*.dat /opt/app/aaf/cass_init/dats/ RUN mkdir -p /opt/app/aaf/status && chmod 777 /opt/app/aaf/status -#RUN addgroup ${USER} && adduser --no-create-home --ingroup ${USER} --disabled-password --gecos "" --shell /bin/bash ${USER} -#RUN chown -R ${USER}:${USER} /opt/app/aaf/cass_init +RUN addgroup ${USER} && adduser --no-create-home --ingroup ${USER} --disabled-password --gecos "" --shell /bin/bash ${USER} +RUN chown -R ${USER}:${USER} /opt/app/aaf/cass_init ENTRYPOINT ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh"] diff --git a/auth/auth-cass/docker/dbuild.sh b/auth/auth-cass/docker/dbuild.sh index c708dad5..2913b1af 100644 --- a/auth/auth-cass/docker/dbuild.sh +++ b/auth/auth-cass/docker/dbuild.sh @@ -26,19 +26,28 @@ if [ -e ../../docker/d.props ]; then fi DOCKER=${DOCKER:-docker} -echo "Building aaf_cass Container for aaf_cass:$VERSION" +echo "$0: Building aaf_cass Container for aaf_cass:$VERSION" + +# default nexus repo only contains Amd64 images, use docker.io for multi-platform builds +if [[ $1 && $1 == "docker.io" ]]; then + DOCKER_PULL_REGISTRY='' +else + DOCKER_PULL_REGISTRY='nexus3.onap.org:10001\/' +fi +echo "$0: DOCKER_PULL_REGISTRY=${DOCKER_REGISTRY}" DIR=$(pwd) cd .. sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \ -e 's/${USER}/'${USER}'/g' \ + -e 's/${REGISTRY}/'${DOCKER_PULL_REGISTRY}'/g' \ $DIR/Dockerfile.cass > Dockerfile cd .. cp -Rf sample/cass_data auth-cass/cass_data cp sample/data/sample.identities.dat auth-cass cp auth-batch/target/aaf-auth-batch-$VERSION-full.jar auth-cass -echo $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass +echo "$0: $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass" $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass $DOCKER tag ${ORG}/${PROJECT}/aaf_cass:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_cass:${VERSION} $DOCKER tag ${ORG}/${PROJECT}/aaf_cass:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_cass:latest |