diff options
| author |   jhh <jorge.hernandez-herrero@att.com> | 2019-04-26 12:17:40 -0500 |
|---|---|---|
| committer | jhh <jorge.hernandez-herrero@att.com> | 2019-04-26 12:17:40 -0500 |
| commit | b5df17d39e93d91ed3f228b077ada296986ff4f6 (patch) | |
| tree | b2611f3790372f270a0482e42fffd2fac88929ff | |
| parent | fa324fe235bbba668adeb147ffca27a4124b5af9 (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: Ide67a181e5959c5e0d087345db86baf0cc8169b6
Issue-ID: INT-998
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
| -rw-r--r-- | docker_build.sh | 2 | ||||
| -rw-r--r-- | docker_merge.sh | 2 | ||||
| -rw-r--r-- | docker_verify.sh | 2 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/docker-install.sh | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/docker_build.sh b/docker_build.sh index 7100d6c35..2f11b0ba4 100644 --- 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 f946648fd..c624662b9 100644 --- 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 a534ee52b..d97a87f1a 100644 --- 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 fbd834dbe..ac9779553 100644 --- 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 |