summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2019-04-26 12:01:14 -0500
committerjhh <jorge.hernandez-herrero@att.com>2019-04-26 12:01:14 -0500
commit7df0f4e0af8ee6d4bd3c95c3db11b81adbba3122 (patch)
tree4d645c8c15d4028ea91f344d9910ef736485a006
parent5ad8b689be1219528c1adc7fb4ac2de4949c5b06 (diff)
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>
-rw-r--r--docker_build.sh2
-rw-r--r--docker_merge.sh2
-rw-r--r--docker_verify.sh2
-rw-r--r--packages/docker/src/main/docker/Dockerfile4
4 files changed, 5 insertions, 5 deletions
diff --git a/docker_build.sh b/docker_build.sh
index bce8a835..cf0ea8c2 100644
--- 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 ed7677a9..8a1ad8a7 100644
--- 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 d3ad6e0a..bcd880a0 100644
--- 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 ba136fd3..93680361 100644
--- 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}