From fa324fe235bbba668adeb147ffca27a4124b5af9 Mon Sep 17 00:00:00 2001 From: jhh Date: Thu, 25 Apr 2019 22:58:37 -0500 Subject: [PATCH] Manually pull the base alpine images Add a hack to undo directory creation from parent images since it causes container initialization to fail. Change-Id: I99dc404cd56a67a2cc84eb1a3773b028ed533d95 Issue-ID: INT-998 Signed-off-by: jhh --- docker_build.sh | 4 ++++ docker_merge.sh | 4 ++++ docker_verify.sh | 4 ++++ packages/docker/src/main/docker/Dockerfile | 4 +++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/docker_build.sh b/docker_build.sh index 671b54ffe..7100d6c35 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -61,6 +61,10 @@ fi echo $MVN_MAJMIN_VERSION +docker login -u docker -p docker nexus3.onap.org:10001 +docker pull nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 +docker tag nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 onap/policy-common-alpine:1.4.0 + echo "Building $IMAGE" # diff --git a/docker_merge.sh b/docker_merge.sh index 1eb7185a4..f946648fd 100644 --- a/docker_merge.sh +++ b/docker_merge.sh @@ -63,6 +63,10 @@ echo $MVN_MAJMIN_VERSION echo "Building $IMAGE" +docker login -u docker -p docker nexus3.onap.org:10001 +docker pull nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 +docker tag nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 onap/policy-common-alpine:1.4.0 + # # This is the local latest tagged image. The Dockerfile's need this to build images # diff --git a/docker_verify.sh b/docker_verify.sh index 11e2fefd2..a534ee52b 100644 --- a/docker_verify.sh +++ b/docker_verify.sh @@ -66,6 +66,10 @@ echo $MVN_MAJMIN_VERSION echo "Building $IMAGE" +docker login -u docker -p docker nexus3.onap.org:10001 +docker pull nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 +docker tag nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 onap/policy-common-alpine:1.4.0 + # # This is the local latest tagged image. The Dockerfile's need this to build images # diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index 66aff075e..69639ccfe 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -9,7 +9,9 @@ ENV POLICY_LOGS ${POLICY_LOGS} RUN apk add --no-cache mariadb-client RUN mkdir -p /tmp/policy-install ${POLICY_LOGS} && \ - chown policy:policy /tmp/policy-install ${POLICY_LOGS} + chown policy:policy /tmp/policy-install ${POLICY_LOGS} && \ + rmdir ${POLICY_HOME}/etc/ssl && \ + rmdir ${POLICY_HOME}/etc WORKDIR /tmp/policy-install -- 2.16.6