New BUILD_VERSION needed as fixed in parent image

BUILD_VERSION could not be used in ENV variable
as it is cooked in the base image itself.  Need to
create a new one to reflect the drools build to
get by.

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

diff --git a/docker_build.sh b/docker_build.sh
index bce8a83..cf0ea8c 100644 (file)
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -19,7 +19,7 @@ DOCKER_REPOSITORY=nexus3.onap.org:10003
 MVN_VERSION=$(cat packages/docker/target/version)
 MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . packages/docker/target/version)
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
-BUILD_ARGS="--build-arg BUILD_VERSION=${MVN_VERSION}"
+BUILD_ARGS="--build-arg BUILD_VERSION_DROOLS=${MVN_VERSION}"
 IMAGE=policy-drools
 
 echo $DOCKER_REPOSITORY

diff --git a/docker_merge.sh b/docker_merge.sh
index ed7677a..8a1ad8a 100644 (file)
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -19,7 +19,7 @@ DOCKER_REPOSITORY=nexus3.onap.org:10003
 MVN_VERSION=$(cat packages/docker/target/version)
 MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . packages/docker/target/version)
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
-BUILD_ARGS="--build-arg BUILD_VERSION=${MVN_VERSION}"
+BUILD_ARGS="--build-arg BUILD_VERSION_DROOLS=${MVN_VERSION}"
 IMAGE=policy-drools
 
 echo $DOCKER_REPOSITORY

diff --git a/docker_verify.sh b/docker_verify.sh
index d3ad6e0..bcd880a 100644 (file)
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -22,7 +22,7 @@ DOCKER_REPOSITORY=nexus3.onap.org:10003
 MVN_VERSION=$(cat packages/docker/target/version)
 MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . packages/docker/target/version)
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
-BUILD_ARGS="--build-arg BUILD_VERSION=${MVN_VERSION}"
+BUILD_ARGS="--build-arg BUILD_VERSION_DROOLS=${MVN_VERSION}"
 IMAGE=policy-drools
 
 echo $DOCKER_REPOSITORY

diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index ba136fd..9368036 100644 (file)
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -2,11 +2,11 @@ FROM onap/policy-common-alpine:1.4.0
 
 LABEL maintainer="Policy Team"
 
-ARG BUILD_VERSION=${BUILD_VERSION}
+ARG BUILD_VERSION_DROOLS=${BUILD_VERSION_DROOLS}
 ARG POLICY_LOGS=/var/log/onap/policy/pdpd
 ARG POLICY_INSTALL=/tmp/policy-install
 
-ENV BUILD_VERSION ${BUILD_VERSION}
+ENV BUILD_VERSION_DROOLS ${BUILD_VERSION_DROOLS}
 ENV POLICY_INSTALL ${POLICY_INSTALL}
 ENV POLICY_INSTALL_INIT ${POLICY_INSTALL}/config
 ENV POLICY_LOGS ${POLICY_LOGS}