Manually pull the base alpine images.

Undo directory creation of base image to preserve
original layout pre-use of alpine common/base images.

Change-Id: I0e95cc2d6d6da03be66e3b0c2413676539909bb0
Issue-ID: INT-998
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

diff --git a/docker_build.sh b/docker_build.sh
index 64abc90..bce8a83 100644 (file)
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -48,6 +48,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 3cbef59..ed7677a 100644 (file)
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -48,6 +48,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_verify.sh b/docker_verify.sh
index e2fbe27..d3ad6e0 100644 (file)
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -51,6 +51,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/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index 6f4d9a2..4c457cb 100644 (file)
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -21,7 +21,9 @@ RUN apk add --no-cache \
     && pip install http-prompt
 
 RUN mkdir -p ${POLICY_CONFIG} ${POLICY_LOGS} ${POLICY_INSTALL_INIT} && \
-    chown -R policy:policy ${POLICY_LOGS} ${POLICY_INSTALL}
+    chown -R policy:policy ${POLICY_LOGS} ${POLICY_INSTALL} && \
+    rmdir ${POLICY_HOME}/etc/ssl && \
+    rmdir ${POLICY_HOME}/etc
 
 WORKDIR ${POLICY_INSTALL}
 COPY install-drools.zip docker-install.sh do-start.sh wait-for-port.sh ./