diff options
14 files changed, 268 insertions, 10 deletions
diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml index ba9a56416..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> @@ -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> @@ -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> @@ -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> 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 b4dad4e43..b4dad4e43 100644 --- a/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile 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 970f8aaca..970f8aaca 100644 --- a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile 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 4d3303ec1..4d3303ec1 100644 --- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile 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 ceb4776cd..ceb4776cd 100644 --- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile 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 8b3fd8437..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}" 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 27e909546..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}" 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 c9bde11db..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}" 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 5a1aeda99..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}" 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> |