From 8205d4a0e1cc32d7ecfba6e62ee2ee1d6fac10b8 Mon Sep 17 00:00:00 2001
From: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Date: Thu, 21 Feb 2019 23:30:40 -0600
Subject: pull + tag base image for ci workings

Change-Id: Id8759b1ad7a2ddaccc0739074eca7b00124c45ab
Issue-ID: POLICY-1537
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
---
 controlloop/build/docker-cl                        | 22 ++++++++++++++--------
 .../docker-controlloop/src/main/docker/Dockerfile  |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'controlloop')

diff --git a/controlloop/build/docker-cl b/controlloop/build/docker-cl
index 659c2bad9..663b1f4b1 100644
--- a/controlloop/build/docker-cl
+++ b/controlloop/build/docker-cl
@@ -45,7 +45,12 @@ function build {
         tags="${tags} --tag ${tag}"
     done
 
-    (set -x; docker build ${BUILD_ARGS} ${tags} ${IMAGE_PATH})
+    (
+    set -x;
+    docker pull "${DOCKER_PULL_REPOSITORY}"/onap/policy-drools
+    docker tag "${DOCKER_PULL_REPOSITORY}"/onap/policy-drools onap/policy-drools
+    docker build ${BUILD_ARGS} ${tags} ${IMAGE_PATH}
+    )
 
     if [[ $? != 0 ]]; then
         echo -e "\nERROR: docker build\n"
@@ -131,7 +136,7 @@ function run {
     (
     set -x
     docker run --rm ${debugEnv} -it -v "${volume}":/tmp/policy-install/config -p 9696:9696 \
-        --name pdpd-cl onap/policy-pdpd-cl ${cmd}
+        --name pdpd-cl onap/"${IMAGE}" ${cmd}
     )
 
     return $?
@@ -153,7 +158,8 @@ if [[ ! -f "${VERSION_PATH}" ]]; then
     fi
 fi
 
-DOCKER_REPOSITORY="nexus3.onap.org:10003"
+DOCKER_PULL_REPOSITORY="nexus3.onap.org:10001"
+DOCKER_PUSH_REPOSITORY="nexus3.onap.org:10003"
 IMAGE=policy-pdpd-cl
 IMAGE_PATH="controlloop/packages/docker-controlloop/target/${IMAGE}"
 
@@ -186,17 +192,17 @@ echo -e "BUILD INFO:"
 echo -e "\timage: ${IMAGE}"
 echo -e "\timage-path: ${IMAGE_PATH}"
 echo -e "\timage: ${IMAGE}"
-echo -e "\tregistry: ${DOCKER_REPOSITORY}"
+echo -e "\tregistry: ${DOCKER_PUSH_REPOSITORY}"
 echo -e "\tpatch: ${VERSION}"
 echo -e "\tversion: ${MAJOR_MINOR_VERSION}"
 echo -e "\ttimestamp: ${TIMESTAMP}"
 echo
 
 TAG_LATEST="onap/${IMAGE}:latest"
-TAG_REPO_LATEST="${DOCKER_REPOSITORY}/onap/${IMAGE}:latest"
-TAG_REPO_VERSION_LATEST="${DOCKER_REPOSITORY}/onap/${IMAGE}:${MAJOR_MINOR_VERSION}-latest"
-TAG_REPO_VERSION_TIMESTAMP="${DOCKER_REPOSITORY}/onap/${IMAGE}:${VERSION}-${TIMESTAMP}Z"
-TAG_REPO_VERSION_STAGING_TIMESTAMP="${DOCKER_REPOSITORY}/onap/${IMAGE}:${VERSION}-STAGING-${TIMESTAMP}Z"
+TAG_REPO_LATEST="${DOCKER_PUSH_REPOSITORY}/onap/${IMAGE}:latest"
+TAG_REPO_VERSION_LATEST="${DOCKER_PUSH_REPOSITORY}/onap/${IMAGE}:${MAJOR_MINOR_VERSION}-latest"
+TAG_REPO_VERSION_TIMESTAMP="${DOCKER_PUSH_REPOSITORY}/onap/${IMAGE}:${VERSION}-${TIMESTAMP}Z"
+TAG_REPO_VERSION_STAGING_TIMESTAMP="${DOCKER_PUSH_REPOSITORY}/onap/${IMAGE}:${VERSION}-STAGING-${TIMESTAMP}Z"
 
 VERIFY_BUILD_TAGS="${TAG_LATEST} ${TAG_REPO_VERSION_LATEST} ${TAG_REPO_VERSION_TIMESTAMP}"
 
diff --git a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
index 7bb2006cf..f718b1601 100644
--- a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
+++ b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/policy-drools:1.4-SNAPSHOT-latest
+FROM onap/policy-drools
 
 ARG BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL}
 ENV BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL}
-- 
cgit 1.2.3-korg