summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO.yaml8
-rw-r--r--packages/policy-clamp-docker/pom.xml18
-rw-r--r--packages/policy-clamp-docker/src/main/docker/AcmRuntime-Suse.Dockerfile60
-rw-r--r--packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile (renamed from packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile)2
-rw-r--r--packages/policy-clamp-docker/src/main/docker/HttpParticipant-Suse.Dockerfile60
-rw-r--r--packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile (renamed from packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile)2
-rw-r--r--packages/policy-clamp-docker/src/main/docker/KubernetesParticipant-Suse.Dockerfile70
-rw-r--r--packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile (renamed from packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile)2
-rw-r--r--packages/policy-clamp-docker/src/main/docker/PolicyParticipant-Suse.Dockerfile60
-rw-r--r--packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile (renamed from packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile)2
-rw-r--r--packages/policy-clamp-docker/src/main/docker/acm-runtime.sh13
-rw-r--r--packages/policy-clamp-docker/src/main/docker/http-participant.sh12
-rw-r--r--packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh12
-rw-r--r--packages/policy-clamp-docker/src/main/docker/policy-participant.sh13
-rw-r--r--packages/pom.xml14
15 files changed, 296 insertions, 52 deletions
diff --git a/INFO.yaml b/INFO.yaml
index 5c0e39c6b..e328101ea 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -61,6 +61,11 @@ committers:
company: 'Bell Canada'
id: 'a.sreekumar'
timezone: 'Europe/Ireland'
+ - name: 'Ramesh Murugan Iyer'
+ email: 'ramesh.murugan.iyer@est.tech'
+ company: 'Ericsson'
+ id: 'rameshiyer27'
+ timezone: 'Europe/Ireland'
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
changes:
@@ -114,3 +119,6 @@ tsc:
- type: 'Removal'
name: 'Xue Gao'
link: https://lists.onap.org/g/onap-tsc/message/8096
+ - type: 'Addition'
+ name: 'Ramesh Murugan Iyer'
+ link: https://lists.onap.org/g/onap-tsc/message/8689
diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml
index bf5b2e3cc..10747ff87 100644
--- a/packages/policy-clamp-docker/pom.xml
+++ b/packages/policy-clamp-docker/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2021 Nordix Foundation.
+ Copyright (C) 2021-2022 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@
<name>onap/policy-clamp-runtime-acm</name>
<build>
<cleanup>try</cleanup>
- <dockerFile>AcmRuntimeDockerfile</dockerFile>
+ <dockerFile>AcmRuntime${dockerFileFlavor}.Dockerfile</dockerFile>
<tags>
<tag>${project.version}</tag>
<tag>${project.version}-${maven.build.timestamp}</tag>
@@ -115,7 +115,7 @@
<includes>
<include>org.onap.policy.clamp:policy-clamp-runtime-acm</include>
</includes>
- <outputFileNameMapping>app.jar</outputFileNameMapping>
+ <outputFileNameMapping>policy-clamp-runtime-acm.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
</inline>
@@ -127,7 +127,7 @@
<alias>onap-policy-clamp-ac-pf-ppnt</alias>
<build>
<cleanup>try</cleanup>
- <dockerFile>PolicyParticipantDockerfile</dockerFile>
+ <dockerFile>PolicyParticipant${dockerFileFlavor}.Dockerfile</dockerFile>
<tags>
<tag>${project.version}</tag>
<tag>${project.version}-${maven.build.timestamp}</tag>
@@ -147,7 +147,7 @@
<includes>
<include>org.onap.policy.clamp.participant:policy-clamp-participant-impl-policy</include>
</includes>
- <outputFileNameMapping>app.jar</outputFileNameMapping>
+ <outputFileNameMapping>policy-clamp-participant-impl-policy.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
</inline>
@@ -159,7 +159,7 @@
<alias>onap-policy-clamp-ac-k8s-ppnt</alias>
<build>
<cleanup>try</cleanup>
- <dockerFile>KubernetesParticipantDockerfile</dockerFile>
+ <dockerFile>KubernetesParticipant${dockerFileFlavor}.Dockerfile</dockerFile>
<tags>
<tag>${project.version}</tag>
<tag>${project.version}-${maven.build.timestamp}</tag>
@@ -179,7 +179,7 @@
<includes>
<include>org.onap.policy.clamp.participant:policy-clamp-participant-impl-kubernetes</include>
</includes>
- <outputFileNameMapping>app.jar</outputFileNameMapping>
+ <outputFileNameMapping>policy-clamp-participant-impl-kubernetes.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
</inline>
@@ -191,7 +191,7 @@
<alias>onap-policy-clamp-ac-http-ppnt</alias>
<build>
<cleanup>try</cleanup>
- <dockerFile>HttpParticipantDockerfile</dockerFile>
+ <dockerFile>HttpParticipant${dockerFileFlavor}.Dockerfile</dockerFile>
<tags>
<tag>${project.version}</tag>
<tag>${project.version}-${maven.build.timestamp}</tag>
@@ -211,7 +211,7 @@
<includes>
<include>org.onap.policy.clamp.participant:policy-clamp-participant-impl-http</include>
</includes>
- <outputFileNameMapping>app.jar</outputFileNameMapping>
+ <outputFileNameMapping>policy-clamp-participant-impl-http.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
</inline>
diff --git a/packages/policy-clamp-docker/src/main/docker/AcmRuntime-Suse.Dockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntime-Suse.Dockerfile
new file mode 100644
index 000000000..5ed566895
--- /dev/null
+++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntime-Suse.Dockerfile
@@ -0,0 +1,60 @@
+#-------------------------------------------------------------------------------
+# ============LICENSE_START=======================================================
+# Copyright (C) 2022 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#-------------------------------------------------------------------------------
+
+#
+# Docker file to build an image that runs the CLAMP ACM runtime on Java 11 or better in OpenSuse
+#
+FROM opensuse/leap:15.3
+
+LABEL maintainer="Policy Team"
+
+ARG POLICY_LOGS=/var/log/onap/policy/clamp
+
+ENV POLICY_LOGS=$POLICY_LOGS
+ENV POLICY_HOME=/opt/app/policy/clamp
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk-11
+
+RUN zypper -n -q install --no-recommends gzip java-11-openjdk-headless netcat-openbsd tar && \
+ zypper -n -q update && zypper -n -q clean --all && \
+ groupadd --system policy && \
+ useradd --system --shell /bin/sh -G policy policy && \
+ mkdir -p /app $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
+ chown -R policy:policy /app $POLICY_HOME $POLICY_LOGS && \
+ mkdir /packages
+
+COPY /maven/lib/policy-clamp-runtime-acm.tar.gz /packages
+
+RUN tar xvfz /packages/policy-clamp-runtime-acm.tar.gz --directory $POLICY_HOME && \
+ rm /packages/policy-clamp-runtime-acm.tar.gz
+
+WORKDIR $POLICY_HOME
+COPY acm-runtime.sh bin/.
+COPY /maven/policy-clamp-runtime-acm.jar /app/app.jar
+
+RUN chown -R policy:policy * && \
+ chmod 755 bin/*.sh && \
+ chown -R policy:policy /app
+
+EXPOSE 6969
+
+USER policy
+WORKDIR $POLICY_HOME/bin
+ENTRYPOINT [ "./acm-runtime.sh" ]
diff --git a/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile
index b5b6de32f..b4dad4e43 100644
--- a/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile
@@ -40,7 +40,7 @@ RUN tar xvfz /packages/policy-clamp-runtime-acm.tar.gz --directory $POLICY_HOME
WORKDIR $POLICY_HOME
COPY acm-runtime.sh bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-runtime-acm.jar /app/app.jar
RUN chown -R policy:policy * && \
chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipant-Suse.Dockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipant-Suse.Dockerfile
new file mode 100644
index 000000000..3d63317d5
--- /dev/null
+++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipant-Suse.Dockerfile
@@ -0,0 +1,60 @@
+#-------------------------------------------------------------------------------
+# ============LICENSE_START=======================================================
+# Copyright (C) 2022 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#-------------------------------------------------------------------------------
+
+#
+# Docker file to build an image that runs the CLAMP ACM HTTP Participant on Java 11 or better in OpenSuse
+#
+FROM opensuse/leap:15.3
+
+LABEL maintainer="Policy Team"
+
+ARG POLICY_LOGS=/var/log/onap/policy/clamp
+
+ENV POLICY_LOGS=$POLICY_LOGS
+ENV POLICY_HOME=/opt/app/policy/clamp
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk-11
+
+RUN zypper -n -q install --no-recommends gzip java-11-openjdk-headless netcat-openbsd tar && \
+ zypper -n -q update && zypper -n -q clean --all && \
+ groupadd --system policy && \
+ useradd --system --shell /bin/sh -G policy policy && \
+ mkdir -p /app $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
+ chown -R policy:policy /app $POLICY_HOME $POLICY_LOGS && \
+ mkdir /packages
+
+COPY /maven/lib/http-participant.tar.gz /packages
+
+RUN tar xvfz /packages/http-participant.tar.gz --directory $POLICY_HOME && \
+ rm /packages/http-participant.tar.gz
+
+WORKDIR $POLICY_HOME
+COPY http-participant.sh bin/.
+COPY /maven/policy-clamp-participant-impl-http.jar /app/app.jar
+
+RUN chown -R policy:policy * && \
+ chmod 755 bin/*.sh && \
+ chown -R policy:policy /app
+
+EXPOSE 8084
+
+USER policy
+WORKDIR $POLICY_HOME/bin
+ENTRYPOINT [ "./http-participant.sh" ]
diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile
index 4311f6c87..970f8aaca 100644
--- a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile
@@ -41,7 +41,7 @@ RUN tar xvfz /packages/http-participant.tar.gz --directory $POLICY_HOME && \
WORKDIR $POLICY_HOME
COPY http-participant.sh bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-http.jar /app/app.jar
RUN chown -R policy:policy * && \
chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant-Suse.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant-Suse.Dockerfile
new file mode 100644
index 000000000..9e6d0ef9a
--- /dev/null
+++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant-Suse.Dockerfile
@@ -0,0 +1,70 @@
+#-------------------------------------------------------------------------------
+# ============LICENSE_START=======================================================
+# Copyright (C) 2022 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#-------------------------------------------------------------------------------
+
+#
+# Docker file to build an image that runs the CLAMP ACM K8S Participant on Java 11 or better in OpenSuse
+#
+FROM opensuse/leap:15.3
+
+LABEL maintainer="Policy Team"
+
+ARG POLICY_LOGS=/var/log/onap/policy/clamp
+
+ENV POLICY_LOGS=$POLICY_LOGS
+ENV POLICY_HOME=/opt/app/policy/clamp
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk-11
+
+RUN zypper -n -q install --no-recommends gzip java-11-openjdk-headless netcat-openbsd tar wget && \
+ zypper -n -q update && zypper -n -q clean --all && \
+ groupadd --system policy && \
+ useradd --system --shell /bin/sh -G policy policy && \
+ mkdir -p /app $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
+ chown -R policy:policy /app $POLICY_HOME $POLICY_LOGS && \
+ mkdir /packages
+
+COPY /maven/lib/kubernetes-participant.tar.gz /packages
+
+RUN tar xvfz /packages/kubernetes-participant.tar.gz --directory $POLICY_HOME && \
+ rm /packages/kubernetes-participant.tar.gz
+
+WORKDIR $POLICY_HOME
+COPY kubernetes-participant.sh bin/.
+COPY /maven/policy-clamp-participant-impl-kubernetes.jar /app/app.jar
+
+RUN chown -R policy:policy * && \
+ chmod 755 bin/*.sh && \
+ chown -R policy:policy /app && \
+ wget https://get.helm.sh/helm-v3.5.2-linux-amd64.tar.gz && \
+ tar xvf helm-v3.5.2-linux-amd64.tar.gz && \
+ mv linux-amd64/helm /usr/local/bin && \
+ rm -rf linux-amd64 && \
+ rm helm-v3.5.2-linux-amd64.tar.gz && \
+ wget https://storage.googleapis.com/kubernetes-release/release/v1.21.1/bin/linux/amd64/kubectl && \
+ chmod +x kubectl && \
+ mv kubectl /usr/local/bin/kubectl
+
+EXPOSE 8083
+
+USER policy
+WORKDIR $POLICY_HOME/bin
+ENTRYPOINT [ "./kubernetes-participant.sh" ]
+
+
diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile
index bed957c37..4d3303ec1 100644
--- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile
@@ -40,7 +40,7 @@ RUN tar xvfz /packages/kubernetes-participant.tar.gz --directory $POLICY_HOME &&
WORKDIR $POLICY_HOME
COPY kubernetes-participant.sh bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-kubernetes.jar /app/app.jar
RUN chown -R policy:policy * && \
chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant-Suse.Dockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant-Suse.Dockerfile
new file mode 100644
index 000000000..e688d974e
--- /dev/null
+++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant-Suse.Dockerfile
@@ -0,0 +1,60 @@
+#-------------------------------------------------------------------------------
+# ============LICENSE_START=======================================================
+# Copyright (C) 2022 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#-------------------------------------------------------------------------------
+
+#
+# Docker file to build an image that runs the CLAMP ACM Policy Framework Participant on Java 11 or better in OpenSuse
+#
+FROM opensuse/leap:15.3
+
+LABEL maintainer="Policy Team"
+
+ARG POLICY_LOGS=/var/log/onap/policy/clamp
+
+ENV POLICY_LOGS=$POLICY_LOGS
+ENV POLICY_HOME=/opt/app/policy/clamp
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk-11
+
+RUN zypper -n -q install --no-recommends gzip java-11-openjdk-headless netcat-openbsd tar && \
+ zypper -n -q update && zypper -n -q clean --all && \
+ groupadd --system policy && \
+ useradd --system --shell /bin/sh -G policy policy && \
+ mkdir -p /app $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
+ chown -R policy:policy /app $POLICY_HOME $POLICY_LOGS && \
+ mkdir /packages
+
+COPY /maven/lib/policy-participant.tar.gz /packages
+
+RUN tar xvfz /packages/policy-participant.tar.gz --directory $POLICY_HOME && \
+ rm /packages/policy-participant.tar.gz
+
+WORKDIR $POLICY_HOME
+COPY policy-participant.sh bin/.
+COPY /maven/policy-clamp-participant-impl-policy.jar /app/app.jar
+
+RUN chown -R policy:policy * && \
+ chmod 755 bin/*.sh && \
+ chown -R policy:policy /app
+
+EXPOSE 8085
+
+USER policy
+WORKDIR $POLICY_HOME/bin
+ENTRYPOINT [ "./policy-participant.sh" ]
diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile
index f70e07e20..ceb4776cd 100644
--- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile
@@ -40,7 +40,7 @@ RUN tar xvfz /packages/policy-participant.tar.gz --directory $POLICY_HOME && \
WORKDIR $POLICY_HOME
COPY policy-participant.sh bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-policy.jar /app/app.jar
RUN chown -R policy:policy * && \
chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
index 84550de82..10a8a3c86 100644
--- a/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
+++ b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
@@ -19,7 +19,6 @@
# ============LICENSE_END=========================================================
#
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}"
TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}"
KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}"
@@ -27,15 +26,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/AcRuntimeParameters.yaml"
fi
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp runtime acm config file: $CONFIG_FILE"
if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
echo "overriding policy-truststore"
@@ -52,11 +49,7 @@ 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/AcRuntimeParameters.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}" \
@@ -68,4 +61,4 @@ $JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
-Dcom.sun.management.jmxremote.authenticate=false \
-Dcom.sun.management.jmxremote.local.only=false \
-jar /app/app.jar \
- --spring.config.location="${POLICY_HOME}/config/AcRuntimeParameters.yaml"
+ --spring.config.location="${CONFIG_FILE}"
diff --git a/packages/policy-clamp-docker/src/main/docker/http-participant.sh b/packages/policy-clamp-docker/src/main/docker/http-participant.sh
index 17daa18f9..46106082c 100644
--- a/packages/policy-clamp-docker/src/main/docker/http-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/http-participant.sh
@@ -19,7 +19,6 @@
# ============LICENSE_END=========================================================
#
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}"
TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}"
KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}"
@@ -27,15 +26,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/HttpParticipantParameters.yaml"
fi
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp HTTP participant config file: $CONFIG_FILE"
if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
echo "overriding policy-truststore"
@@ -52,13 +49,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/HttpParticipantParameters.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/HttpParticipantParameters.yaml"
+ --spring.config.location="${CONFIG_FILE}"
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..50b6ddb59 100644
--- a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
@@ -19,7 +19,6 @@
# ============LICENSE_END=========================================================
#
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}"
TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}"
KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}"
@@ -27,15 +26,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 +49,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}"
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..6495fa913 100644
--- a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
@@ -19,7 +19,6 @@
# ============LICENSE_END=========================================================
#
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}"
TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}"
KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}"
@@ -27,15 +26,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 +49,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}"
diff --git a/packages/pom.xml b/packages/pom.xml
index db32c8b5a..edac17e4d 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2021 Nordix Foundation.
+ Copyright (C) 2021-2022 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -54,6 +54,18 @@
</modules>
<properties>
<docker.skip.push>false</docker.skip.push>
+ <dockerFileFlavor/>
+ </properties>
+ </profile>
+ <profile>
+ <id>dockersuse</id>
+ <modules>
+ <module>policy-clamp-tarball</module>
+ <module>policy-clamp-docker</module>
+ </modules>
+ <properties>
+ <docker.skip.push>false</docker.skip.push>
+ <dockerFileFlavor>-Suse</dockerFileFlavor>
</properties>
</profile>
</profiles>