From 19cade1c9284316bf15456002db354c894844c96 Mon Sep 17 00:00:00 2001
From: Rashmi Pujar <rashmi.pujar@bell.ca>
Date: Mon, 3 Jun 2019 17:14:45 -0400
Subject: Use io.fabric8:docker-maven-plugin to build and push docker images

Addressed POLICY-1808 for drools-applications to fix the tag to be major.minor-SNAPSHOT-latest

Issue-ID: POLICY-969
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: I6c9ddec9a2e7a73ba68343eb98e0145ce811868e
---
 .../docker-controlloop/src/main/docker/Dockerfile  | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'controlloop/packages/docker-controlloop/src/main/docker/Dockerfile')

diff --git a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
index 9f1845da3..e1bed07b2 100644
--- a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
+++ b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
@@ -1,35 +1,35 @@
-FROM onap/policy-drools:1.4.0
+FROM onap/policy-drools:1.5.0-SNAPSHOT
 
 ARG BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL}
 ENV BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL}
 
-COPY apps-controlloop.zip ${POLICY_INSTALL}/
+COPY /maven/apps-controlloop.zip $POLICY_INSTALL/
 
 RUN unzip apps-controlloop.zip && \
-    mkdir -p ${POLICY_HOME}/logs ${POLICY_HOME}/config ${HOME}/.m2 && \
-    tar -C ${POLICY_HOME} -xvf base-${BUILD_VERSION_DROOLS}.tar.gz --no-same-owner && \
-    tar -C ${POLICY_HOME} -xvf basex-controlloop-${BUILD_VERSION_APP_CL}.tar.gz --no-same-owner && \
-    unzip policy-management-${BUILD_VERSION_DROOLS}.zip -d ${POLICY_HOME} && \
-    echo "source ${POLICY_HOME}/etc/profile.d/env.sh" >> "${HOME}/.bashrc" && \
-    chmod 700 ${POLICY_HOME}/bin/* && \
-    chmod 600 ${POLICY_HOME}/config/* && \
-    chmod 700 ${POLICY_INSTALL}/*.sh && \
-    rm -f ${POLICY_INSTALL}/*.conf
+    mkdir -p $POLICY_HOME/logs $POLICY_HOME/config $HOME/.m2 && \
+    tar -C $POLICY_HOME -xvf base-${BUILD_VERSION_DROOLS}.tar.gz --no-same-owner && \
+    tar -C $POLICY_HOME -xvf basex-controlloop-$BUILD_VERSION_APP_CL.tar.gz --no-same-owner && \
+    unzip policy-management-${BUILD_VERSION_DROOLS}.zip -d $POLICY_HOME && \
+    echo "source $POLICY_HOME/etc/profile.d/env.sh" >> "$HOME/.bashrc" && \
+    chmod 700 $POLICY_HOME/bin/* && \
+    chmod 600 $POLICY_HOME/config/* && \
+    chmod 700 $POLICY_INSTALL/*.sh && \
+    rm -f $POLICY_INSTALL/*.conf
 
-COPY docker-entrypoint.sh ${POLICY_HOME}/bin/
+COPY /maven/docker-entrypoint.sh $POLICY_HOME/bin/
 
-RUN . ${POLICY_HOME}/etc/profile.d/env.sh && \
+RUN . $POLICY_HOME/etc/profile.d/env.sh && \
     mvn org.apache.maven.plugins:maven-dependency-plugin:3.1.1:get \
-        --settings=${POLICY_HOME}/etc/m2/standalone-settings.xml \
+        --settings=$POLICY_HOME/etc/m2/standalone-settings.xml \
         -DartifactId=feature-controlloop-management \
-        -DgroupId=org.onap.policy.drools-applications.controlloop.common -Dversion=${BUILD_VERSION_APP_CL} && \
-    ${POLICY_HOME}/bin/features install healthcheck distributed-locking lifecycle && \
-    ${POLICY_HOME}/bin/features install controlloop-utils controlloop-trans controlloop-management && \
-    ${POLICY_HOME}/bin/features install controlloop-amsterdam controlloop-usecases && \
-    ${POLICY_HOME}/bin/features enable healthcheck distributed-locking lifecycle && \
-    ${POLICY_HOME}/bin/features enable controlloop-trans controlloop-management && \
-    ${POLICY_HOME}/bin/features enable controlloop-amsterdam controlloop-usecases && \
-    rm ${POLICY_INSTALL}/*.zip ${POLICY_INSTALL}/*.gz 2> /dev/null
+        -DgroupId=org.onap.policy.drools-applications.controlloop.common -Dversion=$BUILD_VERSION_APP_CL && \
+    $POLICY_HOME/bin/features install healthcheck distributed-locking lifecycle && \
+    $POLICY_HOME/bin/features install controlloop-utils controlloop-trans controlloop-management && \
+    $POLICY_HOME/bin/features install controlloop-amsterdam controlloop-usecases && \
+    $POLICY_HOME/bin/features enable healthcheck distributed-locking lifecycle && \
+    $POLICY_HOME/bin/features enable controlloop-trans controlloop-management && \
+    $POLICY_HOME/bin/features enable controlloop-amsterdam controlloop-usecases && \
+    rm $POLICY_INSTALL/*.zip $POLICY_INSTALL/*.gz 2> /dev/null
 
 ENTRYPOINT ["/opt/app/policy/bin/docker-entrypoint.sh"]
 CMD ["boot"]
-- 
cgit 1.2.3-korg