diff options
| -rw-r--r-- | INFO.yaml | 8 | ||||
| -rw-r--r-- | packages/policy-xacmlpdp-docker/pom.xml | 3 | ||||
| -rw-r--r-- | packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx-pg.sh | 1 | ||||
| -rw-r--r-- | packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh | 3 | ||||
| -rw-r--r-- | packages/policy-xacmlpdp-docker/src/main/docker/suse.Dockerfile | 51 | ||||
| -rw-r--r-- | packages/pom.xml | 19 | ||||
| -rw-r--r-- | tutorials/tutorial-xacml-application/pom.xml | 3 | ||||
| -rw-r--r-- | tutorials/tutorial-xacml-application/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml | 10 |
9 files changed, 85 insertions, 15 deletions
@@ -51,6 +51,11 @@ committers: company: 'Bell Canada' id: 'a.sreekumar' timezone: 'Europe/Ireland' + - name: 'Ramesh Murugan Iyer' + email: 'ramesh.murugan.iyer@est.tech' + company: 'Ericsson' + id: 'rameshiyer27' + timezone: 'Europe/Ireland' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: @@ -75,3 +80,6 @@ tsc: name: 'Jim Hahn' # Retired link: https://lists.onap.org/g/onap-tsc/message/8056 + - type: 'Addition' + name: 'Ramesh Murugan Iyer' + link: https://lists.onap.org/g/onap-tsc/message/8689 diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml index a60b0ffe..aa849b6e 100644 --- a/packages/policy-xacmlpdp-docker/pom.xml +++ b/packages/policy-xacmlpdp-docker/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. @@ -80,7 +81,7 @@ <name>onap/policy-xacml-pdp</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-xacmlpdp-docker/src/main/docker/policy-pdpx-pg.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx-pg.sh index d6d42e0e..03faedff 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx-pg.sh +++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx-pg.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-xacmlpdp-docker/src/main/docker/policy-pdpx.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh index cd8e5035..ffe6c44a 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh +++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.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. # ================================================================================ # 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/ 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-xacmlpdp-docker/src/main/docker/suse.Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/suse.Dockerfile new file mode 100644 index 00000000..653f8e81 --- /dev/null +++ b/packages/policy-xacmlpdp-docker/src/main/docker/suse.Dockerfile @@ -0,0 +1,51 @@ +#------------------------------------------------------------------------------- +# Dockerfile +# ============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========================================================= +#------------------------------------------------------------------------------- +FROM opensuse/leap:15.3 + +LABEL maintainer="Policy Team" + +ARG POLICY_LOGS=/var/log/onap/policy/pdpx + +ENV POLICY_LOGS=$POLICY_LOGS +ENV POLICY_HOME=/opt/app/policy/pdpx +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 mariadb-client netcat-openbsd postgresql tar && \ + zypper -n -q update && zypper -n -q clean --all && \ + groupadd --system policy && \ + useradd --system --shell /bin/sh -G policy policy && \ + mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/etc/ssl $POLICY_HOME/bin $POLICY_HOME/apps && \ + chown -R policy:policy $POLICY_HOME $POLICY_LOGS && \ + mkdir /packages + +COPY /maven/* /packages +RUN tar xvfz /packages/policy-xacmlpdp.tar.gz --directory $POLICY_HOME && \ + rm /packages/policy-xacmlpdp.tar.gz + +WORKDIR $POLICY_HOME +COPY policy-pdpx.sh bin/. +COPY policy-pdpx-pg.sh bin/. +RUN chown -R policy:policy * && chmod 755 bin/*.sh && chmod 755 mysql/bin/*.sh && chmod 755 postgres/bin/*.sh + +USER policy +WORKDIR $POLICY_HOME/bin +ENTRYPOINT [ "./policy-pdpx.sh" ] diff --git a/packages/pom.xml b/packages/pom.xml index 4ddc17c5..ec7474ef 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,13 +4,14 @@ ================================================================================ Copyright (C) 2019-2020 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. 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. @@ -18,7 +19,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -57,6 +58,18 @@ </modules> <properties> <docker.skip.push>false</docker.skip.push> + <dockerFile>Dockerfile</dockerFile> + </properties> + </profile> + <profile> + <id>dockersuse</id> + <modules> + <module>policy-xacmlpdp-tarball</module> + <module>policy-xacmlpdp-docker</module> + </modules> + <properties> + <docker.skip.push>false</docker.skip.push> + <dockerFile>suse.Dockerfile</dockerFile> </properties> </profile> </profiles> diff --git a/tutorials/tutorial-xacml-application/pom.xml b/tutorials/tutorial-xacml-application/pom.xml index d270e9cf..ad4d6274 100644 --- a/tutorials/tutorial-xacml-application/pom.xml +++ b/tutorials/tutorial-xacml-application/pom.xml @@ -64,9 +64,10 @@ <artifactId>docker-maven-plugin</artifactId> <configuration> <verbose>true</verbose> + <imagePullPolicy>Always</imagePullPolicy> <images> <image> - <name>onap/policy-xacml-tutorial</name> + <name>onap/policy-xacml-tutorial:${project.version}</name> <alias>xacml-pdp</alias> <build> <contextDir>${project.basedir}/src/main/docker</contextDir> diff --git a/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile b/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile index 26106512..943658d9 100644 --- a/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile +++ b/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/policy-xacml-pdp +FROM onap/policy-xacml-pdp:2.7.0-SNAPSHOT ADD maven/${project.build.finalName}.jar /opt/app/policy/pdpx/lib/${project.build.finalName}.jar diff --git a/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml b/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml index a3b72bea..22a9b97f 100644 --- a/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml +++ b/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml @@ -28,7 +28,7 @@ services: expose: - 3306 message-router: - image: nexus3.onap.org:10001/onap/policy-models-simulator:latest + image: nexus3.onap.org:10001/onap/policy-models-simulator:2.7.0-SNAPSHOT container_name: dmaap-simulator hostname: dmaap-simulator volumes: @@ -38,8 +38,7 @@ services: expose: - 3904 api: - # Istanbul To Be released images - image: nexus3.onap.org:10001/onap/policy-api:2.5.0-SNAPSHOT + image: nexus3.onap.org:10001/onap/policy-api:2.7.0-SNAPSHOT container_name: policy-api depends_on: - mariadb @@ -49,8 +48,7 @@ services: expose: - 6767 pap: - # Istanbul To Be released images - image: nexus3.onap.org:10001/onap/policy-pap:2.5.0-SNAPSHOT + image: nexus3.onap.org:10001/onap/policy-pap:2.7.0-SNAPSHOT container_name: policy-pap depends_on: - mariadb @@ -62,7 +60,7 @@ services: expose: - 6868 xacml-pdp: - image: onap/policy-xacml-tutorial + image: onap/policy-xacml-tutorial:2.7.0-SNAPSHOT container_name: policy-xacml-pdp depends_on: - mariadb |