diff options
| -rw-r--r-- | packages/policy-api-docker/pom.xml | 5 | ||||
| -rw-r--r-- | packages/policy-api-docker/src/main/docker/policy-api.sh | 3 | ||||
| -rw-r--r-- | packages/policy-api-docker/src/main/docker/suse.Dockerfile | 53 | ||||
| -rw-r--r-- | packages/pom.xml | 13 | ||||
| -rw-r--r-- | testsuites/stability/src/main/resources/apisetup/config/api/bin/policy-api.sh | 3 |
5 files changed, 71 insertions, 6 deletions
diff --git a/packages/policy-api-docker/pom.xml b/packages/policy-api-docker/pom.xml index 9bc438d9..219aa48d 100644 --- a/packages/policy-api-docker/pom.xml +++ b/packages/policy-api-docker/pom.xml @@ -2,6 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2019,2021 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2020-2022 Bell Canada. + 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. @@ -80,7 +81,7 @@ <name>onap/policy-api</name> <build> <cleanup>try</cleanup> - <dockerFile>Dockerfile</dockerFile> + <dockerFile>${dockerFile}</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -163,4 +164,4 @@ <type>tar.gz</type> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/packages/policy-api-docker/src/main/docker/policy-api.sh b/packages/policy-api-docker/src/main/docker/policy-api.sh index a170e301..e638ceb9 100644 --- a/packages/policy-api-docker/src/main/docker/policy-api.sh +++ b/packages/policy-api-docker/src/main/docker/policy-api.sh @@ -2,7 +2,7 @@ # # ============LICENSE_START======================================================= # Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2019-2020 Nordix Foundation. +# Modifications Copyright (C) 2019-2022 Nordix Foundation. # Modifications Copyright (C) 2022 Bell Canada. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -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-api-docker/src/main/docker/suse.Dockerfile b/packages/policy-api-docker/src/main/docker/suse.Dockerfile new file mode 100644 index 00000000..0f4a4054 --- /dev/null +++ b/packages/policy-api-docker/src/main/docker/suse.Dockerfile @@ -0,0 +1,53 @@ +#------------------------------------------------------------------------------- +# Dockerfile +# ============LICENSE_START======================================================= +# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2022 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/api + +ENV POLICY_LOGS=$POLICY_LOGS +ENV POLICY_HOME=/opt/app/policy/api +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-api.tar.gz /packages +RUN tar xvfz /packages/policy-api.tar.gz --directory $POLICY_HOME && \ + rm /packages/policy-api.tar.gz + +WORKDIR $POLICY_HOME +COPY policy-api.sh bin/. +COPY /maven/api.jar /app + +RUN chown -R policy:policy * && chmod 755 bin/*.sh && chown -R policy:policy /app + +USER policy +WORKDIR $POLICY_HOME/bin +ENTRYPOINT [ "./policy-api.sh" ] diff --git a/packages/pom.xml b/packages/pom.xml index 552101c9..a029b68b 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -2,6 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2020 Bell Canada. + 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. @@ -54,6 +55,18 @@ </modules> <properties> <docker.skip.push>false</docker.skip.push> + <dockerFile>Dockerfile</dockerFile> + </properties> + </profile> + <profile> + <id>dockersuse</id> + <modules> + <module>policy-api-tarball</module> + <module>policy-api-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/apisetup/config/api/bin/policy-api.sh b/testsuites/stability/src/main/resources/apisetup/config/api/bin/policy-api.sh index b3e183a4..dc78ab1d 100644 --- a/testsuites/stability/src/main/resources/apisetup/config/api/bin/policy-api.sh +++ b/testsuites/stability/src/main/resources/apisetup/config/api/bin/policy-api.sh @@ -2,7 +2,7 @@ # # ============LICENSE_START======================================================= # Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2020 Nordix Foundation. +# Modifications Copyright (C) 2020-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. @@ -20,7 +20,6 @@ # ============LICENSE_END========================================================= # -JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ POLICY_API_HOME=/opt/app/policy/api KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore" |