summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2019-04-25 22:58:37 -0500
committerjhh <jorge.hernandez-herrero@att.com>2019-04-25 23:27:35 -0500
commitfa324fe235bbba668adeb147ffca27a4124b5af9 (patch)
tree5fab8e2ce060a8648323f3732a53707bfad7beaf
parentb38e59b1f797b15d0a3e1170e43a0db92216bbd0 (diff)
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 <jorge.hernandez-herrero@att.com>
-rw-r--r--docker_build.sh4
-rw-r--r--docker_merge.sh4
-rw-r--r--docker_verify.sh4
-rw-r--r--packages/docker/src/main/docker/Dockerfile4
4 files changed, 15 insertions, 1 deletions
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