diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2017-08-02 16:15:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-08-02 16:15:57 +0000 |
| commit | 8c79aa61b51e22a3bd0cbe3201ec61067d4fbfe6 (patch) | |
| tree | 82efd61007a708f6c07be5757d14b8ff3925d996 /policy-drools | |
| parent | f43a7e68e22a6be750d34dda6e633682aacec98d (diff) | |
| parent | 9eb6ad5b26c1fd6d1f320c7a2c47448cd0449fd8 (diff) | |
Merge "[POLICY-66] healtcheck feature config and db prep"
Diffstat (limited to 'policy-drools')
| -rw-r--r-- | policy-drools/Dockerfile | 13 | ||||
| -rw-r--r-- | policy-drools/docker-install.sh | 9 |
2 files changed, 20 insertions, 2 deletions
diff --git a/policy-drools/Dockerfile b/policy-drools/Dockerfile index 9ee0f488..a360b012 100644 --- a/policy-drools/Dockerfile +++ b/policy-drools/Dockerfile @@ -1,12 +1,21 @@ FROM onap/policy/policy-base RUN pip install http-prompt -RUN mkdir -p /opt/app/policy /tmp/policy-install && chown policy /opt/app/policy /tmp/policy-install +RUN mkdir -p /opt/app/policy/opt /tmp/policy-install && \ + chown -R policy /opt/app/policy /tmp/policy-install + WORKDIR /tmp/policy-install COPY install-drools.zip apps.zip docker-install.sh do-start.sh wait-for-port.sh ./ +ADD http://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/4.2.0/flyway-commandline-4.2.0.tar.gz /opt/app -RUN unzip install-drools.zip && unzip apps.zip && rm install-drools.zip apps.zip && chown -R policy * && chmod +x *.sh +RUN unzip install-drools.zip && \ + unzip apps.zip && \ + rm install-drools.zip apps.zip && \ + chown -R policy * && \ + chmod +x *.sh && \ + ln -s /opt/app/flyway-4.2.0 /opt/app/flyway && \ + ln -s /opt/app/flyway/flyway /usr/local/bin USER policy CMD ./do-start.sh diff --git a/policy-drools/docker-install.sh b/policy-drools/docker-install.sh index 8bc85c86..281ace10 100644 --- a/policy-drools/docker-install.sh +++ b/policy-drools/docker-install.sh @@ -814,8 +814,17 @@ function installFeatures name="${name%-[0-9]*\.zip}" mkdir -p "${FEATURES_HOME}/${name}" > /dev/null 2>&1 (cd "${FEATURES_HOME}/${name}"; jar xf ${SOURCE_DIR}/${feature}) + featureConf="feature-${name}.conf" + if [[ -r "${featureConf}" ]]; then + configure_component "${featureConf}" "${FEATURES_HOME}" + cp "${featureConf}" "${POLICY_HOME}"/etc/profile.d + echo "feature ${name} has been installed (configuration present)" + else + echo "feature ${name} has been installed (no configuration present)" + fi done + echo "applying base configuration to features" configure_component "${BASE_CONF}" "${FEATURES_HOME}" else echo "error: aborting ${FEATURES_HOME} is not accessible" |