aboutsummaryrefslogtreecommitdiffstats
path: root/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2022-05-31 11:22:10 +0100
committerliamfallon <liam.fallon@est.tech>2022-05-31 15:21:09 +0100
commit8040c95590bca9d7a5e4ac48d72c1198ca66e107 (patch)
treeccd12eaf0679e28dc7a9f3e526fcb1feffa163c8 /packages/policy-clamp-docker/src/main/docker/policy-participant.sh
parentb77b61847ddd169da9a71b05742ed51bc826f5f6 (diff)
Fix HTTP handling in CLAMP ACM
HTTPS is turned on using a Java property in the startup scripts in all the CLAMP ACM docker images. This means that HTTP cannot be enabled or HTTPS disabled in configuration. THis commit fixes that bug. The building of the CLAMP docker images calls each jar app.jar. If all images are being built locally together, the names collide and the last image's jar is used for all jars. This commit fixes that bug as well. Issue-ID: POLICY-4224 Change-Id: If4ba8cdef36f7a8a3665fe60eee31e42159e909b Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'packages/policy-clamp-docker/src/main/docker/policy-participant.sh')
-rw-r--r--packages/policy-clamp-docker/src/main/docker/policy-participant.sh12
1 files changed, 3 insertions, 9 deletions
diff --git a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
index 77cd0c02b..5a1aeda99 100644
--- a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
@@ -27,15 +27,13 @@ TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}"
if [ "$#" -eq 1 ]; then
CONFIG_FILE=$1
-else
- CONFIG_FILE=${CONFIG_FILE}
fi
if [ -z "$CONFIG_FILE" ]; then
CONFIG_FILE="${POLICY_HOME}/etc/PolicyParticipantParameters.yaml"
fi
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp policy participant config file: $CONFIG_FILE"
if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
echo "overriding policy-truststore"
@@ -52,14 +50,10 @@ if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
fi
-touch /app/app.jar
-mkdir -p "${POLICY_HOME}"/config/
-cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/PolicyParticipantParameters.yaml
-
-$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
+$JAVA_HOME/bin/java \
-Dserver.ssl.keyStore="${KEYSTORE}" \
-Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
-Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
-Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \
-jar /app/app.jar \
- --spring.config.location="${POLICY_HOME}/config/PolicyParticipantParameters.yaml"
+ --spring.config.location="${CONFIG_FILE}"