diff options
author | danielhanrahan <daniel.hanrahan@est.tech> | 2022-05-19 10:53:50 +0100 |
---|---|---|
committer | danielhanrahan <daniel.hanrahan@est.tech> | 2022-05-19 10:53:50 +0100 |
commit | f145be7857345ae6362caac2618a1e725c085fbc (patch) | |
tree | d9646b1b7f7a0aeb8818d23314e64c31806eeb1a | |
parent | 4c130853ef64e28aab6bddaebdcd97a5adebd3e2 (diff) |
OpenSuse docker file for policy PAP
Create OpenSuse docker file
Add build profile for OpenSuse docker image
Issue-ID: POLICY-4189
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I4aca4c5d3486cecf012989e9227557587f83bbb6
-rw-r--r-- | packages/policy-pap-docker/pom.xml | 4 | ||||
-rw-r--r-- | packages/policy-pap-docker/src/main/docker/policy-pap.sh | 3 | ||||
-rw-r--r-- | packages/policy-pap-docker/src/main/docker/suse.Dockerfile | 54 | ||||
-rw-r--r-- | packages/pom.xml | 12 | ||||
-rw-r--r-- | testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh | 3 |
5 files changed, 70 insertions, 6 deletions
diff --git a/packages/policy-pap-docker/pom.xml b/packages/policy-pap-docker/pom.xml index 16d18fb9..04f6ab4f 100644 --- a/packages/policy-pap-docker/pom.xml +++ b/packages/policy-pap-docker/pom.xml @@ -1,6 +1,6 @@ <!-- ============LICENSE_START======================================================= - Copyright (C) 2019 Nordix Foundation. + Copyright (C) 2019-2022 Nordix Foundation. Modifications Copyright (C) 2020-2021 Bell Canada. Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. ================================================================================ @@ -80,7 +80,7 @@ <name>onap/policy-pap</name> <build> <cleanup>try</cleanup> - <dockerFile>Dockerfile</dockerFile> + <dockerFile>${dockerFile}</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> diff --git a/packages/policy-pap-docker/src/main/docker/policy-pap.sh b/packages/policy-pap-docker/src/main/docker/policy-pap.sh index 0ba2f429..df785076 100644 --- a/packages/policy-pap-docker/src/main/docker/policy-pap.sh +++ b/packages/policy-pap-docker/src/main/docker/policy-pap.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh # # ============LICENSE_START======================================================= -# Copyright (C) 2019-2020 Nordix Foundation. +# Copyright (C) 2019-2022 Nordix Foundation. # Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. # Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved. # ================================================================================ @@ -21,7 +21,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-pap-docker/src/main/docker/suse.Dockerfile b/packages/policy-pap-docker/src/main/docker/suse.Dockerfile new file mode 100644 index 00000000..d9957d11 --- /dev/null +++ b/packages/policy-pap-docker/src/main/docker/suse.Dockerfile @@ -0,0 +1,54 @@ +#------------------------------------------------------------------------------- +# Dockerfile +# ============LICENSE_START======================================================= +# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2021 Bell Canada. All rights reserved. +# Modifications 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========================================================= +#------------------------------------------------------------------------------- + +FROM opensuse/leap:15.3 + +LABEL maintainer="Policy Team" + +ARG POLICY_LOGS=/var/log/onap/policy/pap + +ENV POLICY_LOGS=$POLICY_LOGS +ENV POLICY_HOME=/opt/app/policy/pap +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-pap.tar.gz /packages +RUN tar xvfz /packages/policy-pap.tar.gz --directory $POLICY_HOME && \ + rm /packages/policy-pap.tar.gz + +WORKDIR $POLICY_HOME +COPY policy-pap.sh bin/. +COPY /maven/pap.jar /app + +RUN chown -R policy:policy * && chmod 755 bin/*.sh && chown -R policy:policy /app + +USER policy +WORKDIR $POLICY_HOME/bin +ENTRYPOINT [ "./policy-pap.sh" ] diff --git a/packages/pom.xml b/packages/pom.xml index 4d7a7983..44956387 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -58,6 +58,18 @@ </modules> <properties> <docker.skip.push>false</docker.skip.push> + <dockerFile>Dockerfile</dockerFile> + </properties> + </profile> + <profile> + <id>dockersuse</id> + <modules> + <module>policy-pap-tarball</module> + <module>policy-pap-docker</module> + </modules> + <properties> + <docker.skip.push>false</docker.skip.push> + <dockerFile>suse.Dockerfile</dockerFile> </properties> </profile> </profiles> diff --git a/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh b/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh index e5cc5a91..29e12bec 100644 --- a/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh +++ b/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh @@ -1,7 +1,7 @@ #!/bin/bash # # ============LICENSE_START======================================================= -# Copyright (C) 2019-2020 Nordix Foundation. +# Copyright (C) 2019-2022 Nordix Foundation. # Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,7 +20,6 @@ # ============LICENSE_END========================================================= # -JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ POLICY_PAP_HOME=/opt/app/policy/pap KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore" |