diff options
4 files changed, 80 insertions, 2 deletions
diff --git a/models-sim/packages/models-simulator-docker/pom.xml b/models-sim/packages/models-simulator-docker/pom.xml index 4fe0af9b6..f1a902445 100644 --- a/models-sim/packages/models-simulator-docker/pom.xml +++ b/models-sim/packages/models-simulator-docker/pom.xml @@ -2,6 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2020 Bell Canada. Modifications Copyright (C) 2020 AT&T Intellectual Property. 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. @@ -97,7 +98,7 @@ <name>onap/policy-models-simulator</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/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh b/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh index a2c2ec5f6..fdf680589 100644 --- a/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh +++ b/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh @@ -5,6 +5,7 @@ # ================================================================================ # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modifications copyright (C) 2020 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. @@ -27,7 +28,6 @@ then SIMULATOR_HOME=${POLICY_HOME}/simulators fi -JAVA_HOME=/usr/lib/jvm/java-11-openjdk KEYSTORE="${SIMULATOR_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" TRUSTSTORE="${SIMULATOR_HOME}/etc/ssl/policy-truststore" diff --git a/models-sim/packages/models-simulator-docker/src/main/docker/suse.Dockerfile b/models-sim/packages/models-simulator-docker/src/main/docker/suse.Dockerfile new file mode 100644 index 000000000..3c1309a42 --- /dev/null +++ b/models-sim/packages/models-simulator-docker/src/main/docker/suse.Dockerfile @@ -0,0 +1,64 @@ +# +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# 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 simulators +# + +FROM opensuse/leap:15.3 + +LABEL maintainer="Policy Team" + +ARG POLICY_LOGS=/var/log/onap/policy/simulators + +ENV POLICY_LOGS=$POLICY_LOGS +ENV POLICY_HOME=/opt/app/policy +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 + +# Create DMaaP simulator user and group +# Add simulator-specific directories and set ownership as the simulator user +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 /opt/app $POLICY_LOGS $POLICY_HOME/simulators $POLICY_HOME/simulators/bin && \ + chown -R policy:policy /opt/app $POLICY_HOME $POLICY_LOGS && \ + mkdir /packages + +# Unpack the tarball +COPY /maven/* /packages +RUN tar xvfz /packages/models-simulator.tar.gz --directory ${POLICY_HOME}/simulators \ + && rm /packages/models-simulator.tar.gz + +# Ensure everything has the correct permissions +# Copy scripts simulator user area +COPY simulators.sh ${POLICY_HOME}/simulators/bin +RUN find /opt/app -type d -perm 755 \ + && find /opt/app -type f -perm 644 \ + && chmod 755 ${POLICY_HOME}/simulators/bin/* \ + && chown -R policy:policy $POLICY_HOME $POLICY_LOGS + +USER policy:policy + +ENV PATH ${POLICY_HOME}/simulators/bin:$PATH +ENTRYPOINT [ "simulators.sh" ] diff --git a/models-sim/packages/pom.xml b/models-sim/packages/pom.xml index 4bf5cc715..4af8dee68 100644 --- a/models-sim/packages/pom.xml +++ b/models-sim/packages/pom.xml @@ -1,6 +1,7 @@ <!-- ============LICENSE_START======================================================= 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. @@ -56,6 +57,18 @@ </modules> <properties> <docker.skip.push>false</docker.skip.push> + <dockerFile>Dockerfile</dockerFile> + </properties> + </profile> + <profile> + <id>dockersuse</id> + <modules> + <module>models-simulator-tarball</module> + <module>models-simulator-docker</module> + </modules> + <properties> + <docker.skip.push>false</docker.skip.push> + <dockerFile>suse.Dockerfile</dockerFile> </properties> </profile> </profiles> |