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: Ide67a181e5959c5e0d087345db86baf0cc8169b6
Issue-ID: INT-998
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

diff --git a/docker_build.sh b/docker_build.sh
index 7100d6c..2f11b0b 100644 (file)
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -25,7 +25,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_ENGINE=${MVN_VERSION}"
 IMAGE=policy-pe
 
 if [ $HTTP_PROXY ]; then

diff --git a/docker_merge.sh b/docker_merge.sh
index f946648..c624662 100644 (file)
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -25,7 +25,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_ENGINE=${MVN_VERSION}"
 IMAGE=policy-pe
 
 if [ $HTTP_PROXY ]; then

diff --git a/docker_verify.sh b/docker_verify.sh
index a534ee5..d97a87f 100644 (file)
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -28,7 +28,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_ENGINE=${MVN_VERSION}"
 IMAGE=policy-pe
 
 if [ $HTTP_PROXY ]; then

diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh
index fbd834d..ac97795 100644 (file)
--- a/packages/docker/src/main/docker/docker-install.sh
+++ b/packages/docker/src/main/docker/docker-install.sh
@@ -555,9 +555,9 @@ function install_brmsgw() {
        
        install_prereqs "${BASE_CONF}"
 
-       if [[ -n ${BUILD_VERSION} ]]; then
-               echo "Replacing ${BUILD_VERSION} in ${COMPONENT_TYPE}.conf"
-               sed -i -e "s/^BRMS_DEPENDENCY_VERSION=.*$/BRMS_DEPENDENCY_VERSION=${BUILD_VERSION}/g" "${COMPONENT_TYPE}.conf"
+       if [[ -n ${BUILD_VERSION_ENGINE} ]]; then
+               echo "Replacing ${BUILD_VERSION_ENGINE} in ${COMPONENT_TYPE}.conf"
+               sed -i -e "s/^BRMS_DEPENDENCY_VERSION=.*$/BRMS_DEPENDENCY_VERSION=${BUILD_VERSION_ENGINE}/g" "${COMPONENT_TYPE}.conf"
        fi
        
        if ! process_configuration "${COMPONENT_TYPE}.conf"; then