diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2018-05-07 18:22:12 -0500 |
|---|---|---|
| committer | Jorge Hernandez <jh1730@att.com> | 2018-05-07 18:22:12 -0500 |
| commit | 973929cfd6cd3e5ba3a837fa56d35b210307c9ac (patch) | |
| tree | 46e2eda34ba87704f9b8250f672286b09c271dd3 /packages/docker/src/main | |
| parent | fad662d64ab3cb3aa2969fbcb9d7ff14cc1f15f1 (diff) | |
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 <jh1730@att.com>
Diffstat (limited to 'packages/docker/src/main')
| -rw-r--r-- | packages/docker/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/docker-install.sh | 7 |
2 files changed, 8 insertions, 1 deletions
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}" |