diff options
| -rw-r--r-- | packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile | 16 | ||||
| -rw-r--r-- | packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile index 0f64e0e2..1efc072c 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile +++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile @@ -4,21 +4,21 @@ LABEL maintainer="Policy Team" ARG POLICY_LOGS=/var/log/onap/policy/pdpx -ENV POLICY_LOGS ${POLICY_LOGS} +ENV POLICY_LOGS=$POLICY_LOGS -ENV POLICY_HOME=/opt/app/policy/pdpx +ENV POLICY_HOME=$POLICY_HOME/pdpx RUN apk add --no-cache mariadb-client -RUN mkdir -p ${POLICY_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_HOME}/bin ${POLICY_HOME}/apps && \ - chown -R policy:policy ${POLICY_HOME} ${POLICY_LOGS} && mkdir /packages +RUN mkdir -p $POLICY_HOME $POLICY_LOGS $POLICY_HOME/etc/ssl $POLICY_HOME/bin $POLICY_HOME/apps && \ + chown -R policy:policy $POLICY_HOME $POLICY_LOGS && mkdir /packages COPY /maven/* /packages -RUN tar xvfz /packages/policy-xacmlpdp.tar.gz --directory ${POLICY_HOME} && \ +RUN tar xvfz /packages/policy-xacmlpdp.tar.gz --directory $POLICY_HOME && \ rm /packages/policy-xacmlpdp.tar.gz -WORKDIR ${POLICY_HOME} +WORKDIR $POLICY_HOME COPY policy-pdpx.sh bin/. -RUN chown -R policy:policy * && chmod 755 bin/*.sh +RUN chown -R policy:policy * && chmod 755 bin/*.sh && chmod 755 mysql/bin/*.sh USER policy -WORKDIR ${POLICY_HOME}/bin +WORKDIR $POLICY_HOME/bin ENTRYPOINT [ "bash", "./policy-pdpx.sh" ] diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh index f27d65d2..5ffe202a 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh +++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.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. @@ -19,7 +20,6 @@ # ============LICENSE_END========================================================= # JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ -POLICY_PDPX_HOME=/opt/app/policy/pdpx KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore" @@ -40,12 +40,12 @@ fi if [ -z "$CONFIG_FILE" ] then - CONFIG_FILE="$POLICY_PDPX_HOME/etc/defaultConfig.json" + CONFIG_FILE="${POLICY_HOME}/etc/defaultConfig.json" fi if [ -z "$PROP_FILE" ] then - PROP_FILE="$POLICY_PDPX_HOME/etc/topic.properties" + PROP_FILE="${POLICY_HOME}/etc/topic.properties" fi if [[ -f ${POLICY_HOME}/etc/mounted/xacml.properties ]]; then @@ -58,4 +58,4 @@ ${POLICY_HOME}/mysql/bin/create-guard-table.sh echo "Policy Xacml PDP config file: $CONFIG_FILE" echo "Policy Xacml PDP topic properties file: $PROP_FILE" -$JAVA_HOME/bin/java -cp "$POLICY_PDPX_HOME/etc:$POLICY_PDPX_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.pdpx.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE
\ No newline at end of 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.pdpx.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE
\ No newline at end of file |