From 973929cfd6cd3e5ba3a837fa56d35b210307c9ac Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Mon, 7 May 2018 18:22:12 -0500 Subject: [PATCH] automate dependency.json version population This avoids error-prone manual version changes to configuration files. Change-Id: I1a991ef9a8eb4cc7dd5fe26d9952286d8b5c0115 Issue-ID: POLICY-766 Signed-off-by: Jorge Hernandez --- docker_build.sh | 8 ++++---- docker_merge.sh | 8 ++++---- docker_verify.sh | 8 ++++---- packages/docker/src/main/docker/Dockerfile | 2 ++ packages/docker/src/main/docker/docker-install.sh | 7 ++++++- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/docker_build.sh b/docker_build.sh index 17608df76..671b54ffe 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -25,14 +25,14 @@ 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) -PROXY_ARGS="" +BUILD_ARGS="--build-arg BUILD_VERSION=${MVN_VERSION}" IMAGE=policy-pe if [ $HTTP_PROXY ]; then - PROXY_ARGS+="--build-arg HTTP_PROXY=${HTTP_PROXY}" + BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" fi if [ $HTTPS_PROXY ]; then - PROXY_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" + BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" fi echo $DOCKER_REPOSITORY @@ -82,7 +82,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${ echo $TAGS -docker build --quiet ${PROXY_ARGS} $TAGS packages/docker/target/$IMAGE +docker build --quiet ${BUILD_ARGS} $TAGS packages/docker/target/$IMAGE if [ $? -ne 0 ] then diff --git a/docker_merge.sh b/docker_merge.sh index 316b9f2be..1eb7185a4 100644 --- a/docker_merge.sh +++ b/docker_merge.sh @@ -25,14 +25,14 @@ 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) -PROXY_ARGS="" +BUILD_ARGS="--build-arg BUILD_VERSION=${MVN_VERSION}" IMAGE=policy-pe if [ $HTTP_PROXY ]; then - PROXY_ARGS+="--build-arg HTTP_PROXY=${HTTP_PROXY}" + BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" fi if [ $HTTPS_PROXY ]; then - PROXY_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" + BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" fi echo $DOCKER_REPOSITORY @@ -78,7 +78,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAM echo $TAGS -docker build --quiet ${PROXY_ARGS} $TAGS packages/docker/target/$IMAGE +docker build --quiet ${BUILD_ARGS} $TAGS packages/docker/target/$IMAGE if [ $? -ne 0 ] then diff --git a/docker_verify.sh b/docker_verify.sh index 428efece8..11e2fefd2 100644 --- a/docker_verify.sh +++ b/docker_verify.sh @@ -28,14 +28,14 @@ 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) -PROXY_ARGS="" +BUILD_ARGS="--build-arg BUILD_VERSION=${MVN_VERSION}" IMAGE=policy-pe if [ $HTTP_PROXY ]; then - PROXY_ARGS+="--build-arg HTTP_PROXY=${HTTP_PROXY}" + BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" fi if [ $HTTPS_PROXY ]; then - PROXY_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" + BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" fi echo $DOCKER_REPOSITORY @@ -81,7 +81,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAM echo $TAGS -docker build --quiet ${PROXY_ARGS} $TAGS packages/docker/target/$IMAGE +docker build --quiet ${BUILD_ARGS} $TAGS packages/docker/target/$IMAGE if [ $? -ne 0 ] then diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index c0ab881d3..b7ed904f5 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -2,10 +2,12 @@ FROM ubuntu:14.04 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} +ARG BUILD_VERSION=${BUILD_VERSION} ARG POLICY_LOGS=/var/log/onap ENV http_proxy $HTTP_PROXY ENV https_proxy $HTTPS_PROXY +ENV BUILD_VERSION ${BUILD_VERSION} ENV POLICY_LOGS ${POLICY_LOGS} RUN \ diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh index 62289c591..8274c6f7b 100644 --- a/packages/docker/src/main/docker/docker-install.sh +++ b/packages/docker/src/main/docker/docker-install.sh @@ -544,6 +544,11 @@ 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" + fi + if ! process_configuration "${COMPONENT_TYPE}.conf"; then echo "error: aborting ${COMPONENT_TYPE} installation: cannot process configuration ${COMPONENT_TYPE}.conf" exit 1 @@ -562,7 +567,7 @@ function install_brmsgw() { echo "error: aborting base installation: cannot create ${POLICY_HOME}/servers/${COMPONENT_TYPE}" exit 1 fi - + /bin/cp -fr "${POLICY_HOME}"/install/servers/${COMPONENT_TYPE}/BRMSGateway.jar "${POLICY_HOME}/servers/${COMPONENT_TYPE}" /bin/cp -fr "${POLICY_HOME}"/install/servers/${COMPONENT_TYPE}/*.properties "${POLICY_HOME}/servers/${COMPONENT_TYPE}" /bin/cp -fr "${POLICY_HOME}"/install/servers/${COMPONENT_TYPE}/config "${POLICY_HOME}/servers/${COMPONENT_TYPE}" -- 2.16.6