diff options
Diffstat (limited to 'packages/policy-clamp-docker')
10 files changed, 234 insertions, 8 deletions
diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml index 576f3d057..3c74a1c34 100644..100755 --- a/packages/policy-clamp-docker/pom.xml +++ b/packages/policy-clamp-docker/pom.xml @@ -1,6 +1,6 @@ <!-- ============LICENSE_START======================================================= - Copyright (C) 2021-2022 Nordix Foundation. + Copyright (C) 2021-2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -71,6 +71,11 @@ </dependency> <dependency> <groupId>org.onap.policy.clamp.participant</groupId> + <artifactId>policy-clamp-participant-impl-kserve</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.clamp.participant</groupId> <artifactId>policy-clamp-participant-impl-a1pms</artifactId> <version>${project.version}</version> </dependency> @@ -87,7 +92,6 @@ <plugin> <groupId>org.codehaus.gmaven</groupId> <artifactId>groovy-maven-plugin</artifactId> - <version>2.1.1</version> <executions> <execution> <phase>validate</phase> @@ -282,6 +286,39 @@ </build> </image> <image> + <name>onap/policy-clamp-ac-kserve-ppnt</name> + <alias>onap-policy-clamp-ac-kserve-ppnt</alias> + <build> + <cleanup>try</cleanup> + <dockerFile>${docker.clamp-ac-kserve-ppnt.dockerFile}</dockerFile> + <contextDir>${docker.clamp-ac-kserve-ppnt.contextDir}</contextDir> + <tags> + <tag>${project.version}</tag> + <tag>${project.version}-${maven.build.timestamp}</tag> + <tag>${project.docker.latest.minmax.tag.version}</tag> + </tags> + <assembly> + <inline> + <dependencySets> + <dependencySet> + <includes> + <include>org.onap.policy.clamp:policy-clamp-tarball</include> + </includes> + <outputDirectory>/lib</outputDirectory> + <outputFileNameMapping>kserve-participant.tar.gz</outputFileNameMapping> + </dependencySet> + <dependencySet> + <includes> + <include>org.onap.policy.clamp.participant:policy-clamp-participant-impl-kserve</include> + </includes> + <outputFileNameMapping>policy-clamp-participant-impl-kserve.jar</outputFileNameMapping> + </dependencySet> + </dependencySets> + </inline> + </assembly> + </build> + </image> + <image> <name>onap/policy-clamp-acm-element-impl</name> <alias>onap-policy-clamp-acm-element-impl</alias> <build> diff --git a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile index 9f393107c..ff08d8ee1 100755 --- a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-2023 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/a1pms-participant ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_LOGS $POLICY_HOME && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile index 3f36f3d36..c77f48b5d 100644 --- a/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-2023 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/policy-clamp-runtime-acm ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile index 0a92cee2e..adfa00d59 100644 --- a/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2022 Nordix Foundation. +# Copyright (C) 2022-2023 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/element-participant ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_LOGS $POLICY_HOME && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile index 17dccaa1d..720927bfc 100644 --- a/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-2023 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/http-participant ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_LOGS $POLICY_HOME && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/KserveParticipant-Suse.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KserveParticipant-Suse.Dockerfile new file mode 100755 index 000000000..df8603d70 --- /dev/null +++ b/packages/policy-clamp-docker/src/main/docker/KserveParticipant-Suse.Dockerfile @@ -0,0 +1,66 @@ +#------------------------------------------------------------------------------- +# ============LICENSE_START======================================================= +# Copyright (C) 2023 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========================================================= +#------------------------------------------------------------------------------- + +FROM busybox AS tarball +RUN mkdir /packages /extracted +COPY /maven/lib/kserve-participant.tar.gz /packages/ +RUN tar xvzf /packages/kserve-participant.tar.gz --directory /extracted/ + +FROM opensuse/leap:15.4 + +LABEL maintainer="Policy Team" +LABEL org.opencontainers.image.title="Policy CLAMP ACM KSERVE Participant" +LABEL org.opencontainers.image.description="Policy CLAMP ACM KSERVE Participant image based on OpenSuse" +LABEL org.opencontainers.image.url="https://github.com/onap/policy-clamp" +LABEL org.opencontainers.image.vendor="ONAP Policy Team" +LABEL org.opencontainers.image.licenses="Apache-2.0" +LABEL org.opencontainers.image.created="${git.build.time}" +LABEL org.opencontainers.image.version="${git.build.version}" +LABEL org.opencontainers.image.revision="${git.commit.id.abbrev}" + +ARG POLICY_LOGS=/var/log/onap/policy/kserve-participant + +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_HOME $POLICY_LOGS && \ + chown -R policy:policy /app $POLICY_HOME $POLICY_LOGS + +COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME + +WORKDIR $POLICY_HOME +COPY --chown=policy:policy kubernetes-participant.sh bin/ +COPY --chown=policy:policy /maven/policy-clamp-participant-impl-kserve.jar /app/app.jar + +RUN chmod 755 bin/*.sh + +EXPOSE 8087 + +USER policy +WORKDIR $POLICY_HOME/bin +ENTRYPOINT [ "./kserve-participant.sh" ] + + diff --git a/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile new file mode 100755 index 000000000..de60cc805 --- /dev/null +++ b/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile @@ -0,0 +1,58 @@ +#------------------------------------------------------------------------------- +# ============LICENSE_START======================================================= +# Copyright (C) 2023 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========================================================= +#------------------------------------------------------------------------------- + +FROM busybox AS tarball +RUN mkdir /packages /extracted +COPY /maven/lib/kserve-participant.tar.gz /packages/ +RUN tar xvzf /packages/kserve-participant.tar.gz --directory /extracted/ + +FROM onap/policy-jre-alpine:2.5.2-SNAPSHOT + +LABEL maintainer="Policy Team" +LABEL org.opencontainers.image.title="Policy CLAMP ACM KSERVE Participant" +LABEL org.opencontainers.image.description="Policy CLAMP ACM Kserve Participant image based on Alpine" +LABEL org.opencontainers.image.url="https://github.com/onap/policy-clamp" +LABEL org.opencontainers.image.vendor="ONAP Policy Team" +LABEL org.opencontainers.image.licenses="Apache-2.0" +LABEL org.opencontainers.image.created="${git.build.time}" +LABEL org.opencontainers.image.version="${git.build.version}" +LABEL org.opencontainers.image.revision="${git.commit.id.abbrev}" + +ARG POLICY_LOGS=/var/log/onap/policy/kserve-participant + +ENV POLICY_LOGS=$POLICY_LOGS +ENV POLICY_HOME=$POLICY_HOME/clamp + +RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ + chown -R policy:policy $POLICY_HOME $POLICY_LOGS + +COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME + +WORKDIR $POLICY_HOME +COPY --chown=policy:policy kserve-participant.sh bin/ +COPY --chown=policy:policy /maven/policy-clamp-participant-impl-kserve.jar /app/app.jar + +RUN chmod 755 bin/*.sh + +EXPOSE 8087 + +USER policy +WORKDIR $POLICY_HOME/bin +ENTRYPOINT [ "./kserve-participant.sh" ] diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile index 1395a678c..72250e8af 100644 --- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-2023 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/k8s-participant ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile index fe08785e6..c82754b17 100644 --- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-2023 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/pf-participant ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/kserve-participant.sh b/packages/policy-clamp-docker/src/main/docker/kserve-participant.sh new file mode 100755 index 000000000..cb88db4be --- /dev/null +++ b/packages/policy-clamp-docker/src/main/docker/kserve-participant.sh @@ -0,0 +1,59 @@ +#!/usr/bin/env sh +# +# ============LICENSE_START======================================================= +# Copyright (C) 2023 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========================================================= +# + +KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" +TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" +KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" +TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" + +if [ "$#" -eq 1 ]; then + CONFIG_FILE=$1 +fi + +if [ -z "$CONFIG_FILE" ]; then + CONFIG_FILE="${POLICY_HOME}/etc/KserveParticipantParameters.yaml" +fi + +echo "Policy clamp Kserve participant config file: $CONFIG_FILE" + +if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then + echo "overriding policy-truststore" + cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" +fi + +if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then + echo "overriding policy-keystore" + cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" +fi + +if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then + echo "overriding logback xml file" + cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ +fi + +$JAVA_HOME/bin/java \ + -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ + -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="${CONFIG_FILE}" |