diff options
| author |   shaoqiu <tim.huang@est.tech> | 2019-06-25 06:10:52 +0000 |
|---|---|---|
| committer | shaoqiu <tim.huang@est.tech> | 2019-06-25 06:10:52 +0000 |
| commit | d0fe049e2575b1192fba6854171637cd6655cd02 (patch) | |
| tree | 5025efe31970f3e040dcf1509090c0f1692102d5 /packages | |
| parent | 5b830d88ba20f1655d0fcd9f1de05cd9c2d0a7c1 (diff) | |
Remove POLICY_API_HOME in Dockerfile
To use POLICY_HOME not POLICY_XXX_HOME
Issue-ID: POLICY-1702
Change-Id: I14e3415f1ee00cd7a82b0d1768eb6c1ab8775424
Signed-off-by: shaoqiu <tim.huang@est.tech>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/policy-api-docker/src/main/docker/Dockerfile | 18 | ||||
| -rw-r--r-- | packages/policy-api-docker/src/main/docker/policy-api.sh | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/packages/policy-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile index a30f7b39..c9e36d02 100644 --- a/packages/policy-api-docker/src/main/docker/Dockerfile +++ b/packages/policy-api-docker/src/main/docker/Dockerfile @@ -4,22 +4,22 @@ LABEL maintainer="Policy Team" ARG POLICY_LOGS=/var/log/onap/policy/api -ENV POLICY_LOGS ${POLICY_LOGS} -ENV POLICY_API_HOME=${POLICY_HOME}/api +ENV POLICY_LOGS=$POLICY_LOGS +ENV POLICY_HOME=$POLICY_HOME/api -RUN mkdir -p ${POLICY_LOGS} ${POLICY_API_HOME} ${POLICY_API_HOME}/bin && \ - chown -R policy:policy ${POLICY_API_HOME} ${POLICY_LOGS} +RUN mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \ + chown -R policy:policy $POLICY_HOME $POLICY_LOGS RUN mkdir /packages COPY /maven/* /packages -RUN tar xvfz /packages/policy-api.tar.gz --directory ${POLICY_API_HOME} && \ +RUN tar xvfz /packages/policy-api.tar.gz --directory $POLICY_HOME && \ rm /packages/policy-api.tar.gz -WORKDIR ${POLICY_API_HOME} +WORKDIR $POLICY_HOME COPY policy-api.sh bin/. -RUN chown -R policy:policy * && chmod 755 bin/*.sh && \ - cp ${POLICY_API_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl && chown policy:policy ${POLICY_HOME}/etc/ssl/* + +RUN chown -R policy:policy * && chmod 755 bin/*.sh USER policy -WORKDIR ${POLICY_API_HOME}/bin +WORKDIR $POLICY_HOME/bin ENTRYPOINT [ "bash", "./policy-api.sh" ] diff --git a/packages/policy-api-docker/src/main/docker/policy-api.sh b/packages/policy-api-docker/src/main/docker/policy-api.sh index dad02fdf..6acedb10 100644 --- a/packages/policy-api-docker/src/main/docker/policy-api.sh +++ b/packages/policy-api-docker/src/main/docker/policy-api.sh @@ -2,6 +2,7 @@ # # ============LICENSE_START======================================================= # Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2019 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +21,6 @@ # JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ -POLICY_API_HOME=/opt/app/policy/api KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore" @@ -35,9 +35,9 @@ fi if [ -z "$CONFIG_FILE" ] then - CONFIG_FILE="$POLICY_API_HOME/etc/defaultConfig.json" + CONFIG_FILE="$POLICY_HOME/etc/defaultConfig.json" fi echo "Policy api config file: $CONFIG_FILE" -$JAVA_HOME/bin/java -cp "$POLICY_API_HOME/etc:$POLICY_API_HOME/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.api.main.startstop.Main -c $CONFIG_FILE +$JAVA_HOME/bin/java -cp "$POLICY_HOME/etc:$POLICY_HOME/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.api.main.startstop.Main -c $CONFIG_FILE |