From 8040c95590bca9d7a5e4ac48d72c1198ca66e107 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 31 May 2022 11:22:10 +0100 Subject: 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 --- .../src/main/docker/kubernetes-participant.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh') diff --git a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh index 3c5fe5c63..c9bde11db 100644 --- a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/kubernetes-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/KubernetesParticipantParameters.yaml" fi -echo "Policy clamp config file: $CONFIG_FILE" +echo "Policy clamp Kubernetes participant config file: $CONFIG_FILE" if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then echo "overriding policy-truststore" @@ -52,13 +50,10 @@ if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/ fi -mkdir -p "${POLICY_HOME}"/config/ -cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/KubernetesParticipantParameters.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/KubernetesParticipantParameters.yaml" + --spring.config.location="${CONFIG_FILE}" -- cgit 1.2.3-korg