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

Addressed POLICY-1808 for drools-pdp 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: I21cd6080972ddf8cf357d6c134203b92fa9eb09b
---
 packages/docker/src/main/docker/Dockerfile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'packages/docker/src')

diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index 5c060ff2..d2fbf471 100644
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -6,12 +6,12 @@ ARG BUILD_VERSION_DROOLS=${BUILD_VERSION_DROOLS}
 ARG POLICY_LOGS=/var/log/onap/policy/pdpd
 ARG POLICY_INSTALL=/tmp/policy-install
 
-ENV BUILD_VERSION_DROOLS ${BUILD_VERSION_DROOLS}
-ENV POLICY_INSTALL ${POLICY_INSTALL}
-ENV POLICY_INSTALL_INIT ${POLICY_INSTALL}/config
-ENV POLICY_LOGS ${POLICY_LOGS}
-ENV POLICY_CONFIG ${POLICY_HOME}/config
-ENV POLICY_LOGBACK ${POLICY_CONFIG}/logback.xml
+ENV BUILD_VERSION_DROOLS $BUILD_VERSION_DROOLS
+ENV POLICY_INSTALL $POLICY_INSTALL
+ENV POLICY_INSTALL_INIT $POLICY_INSTALL/config
+ENV POLICY_LOGS $POLICY_LOGS
+ENV POLICY_CONFIG $POLICY_HOME/config
+ENV POLICY_LOGBACK $POLICY_CONFIG/logback.xml
 ENV POLICY_DOCKER true
 
 RUN apk add --no-cache \
@@ -23,15 +23,15 @@ RUN apk add --no-cache \
     vim \
     && pip install http-prompt
 
-RUN mkdir -p ${POLICY_CONFIG} ${POLICY_LOGS} ${POLICY_INSTALL_INIT} && \
-    chown -R policy:policy ${POLICY_HOME} ${POLICY_LOGS} ${POLICY_INSTALL} && \
-    rmdir ${POLICY_HOME}/etc/ssl && \
-    rmdir ${POLICY_HOME}/etc
+RUN mkdir -p $POLICY_CONFIG $POLICY_LOGS $POLICY_INSTALL_INIT && \
+    chown -R policy:policy $POLICY_HOME $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 ./
+WORKDIR $POLICY_INSTALL
+COPY /maven/install-drools.zip docker-install.sh do-start.sh wait-for-port.sh ./
 
-VOLUME [ "${POLICY_INSTALL_INIT}" ]
+VOLUME [ "$POLICY_INSTALL_INIT" ]
 
 RUN unzip -o install-drools.zip && \
     rm install-drools.zip && \
-- 
cgit 1.2.3-korg