From ab1824d122b50d29e000bb58521d8dace9cba2b6 Mon Sep 17 00:00:00 2001 From: Michael Mokry Date: Wed, 13 Feb 2019 10:34:48 -0600 Subject: Package and Create Docker Image for Xacml PDP - Creates docker image of policy xacml-pdp - Creates zip package of policy xacml-pdp - Also committed changes from Healthcheck/Statitics review that were allowed to be deferred Change-Id: Ia5fb72be05a30a341692453fe4ff32c7b112e861 Issue-ID: POLICY-1436 Signed-off-by: Michael Mokry --- packages/policy-xacmlpdp-docker/pom.xml | 176 +++++++++++++++++++++ .../src/main/docker/Dockerfile | 46 ++++++ .../src/main/docker/policy-pdpx.sh | 43 +++++ packages/policy-xacmlpdp-tarball/pom.xml | 65 ++++++++ .../src/main/package/tarball/assembly.xml | 70 ++++++++ .../src/main/resources/etc/defaultConfig.json | 11 ++ .../src/main/resources/etc/logback.xml | 163 +++++++++++++++++++ .../src/main/resources/etc/s3pConfig.json | 11 ++ .../src/main/resources/etc/ssl/policy-keystore | Bin 0 -> 4311 bytes .../src/main/resources/etc/ssl/policy-truststore | Bin 0 -> 124180 bytes packages/pom.xml | 54 +++++++ 11 files changed, 639 insertions(+) create mode 100644 packages/policy-xacmlpdp-docker/pom.xml create mode 100644 packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile create mode 100644 packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh create mode 100644 packages/policy-xacmlpdp-tarball/pom.xml create mode 100644 packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml create mode 100644 packages/policy-xacmlpdp-tarball/src/main/resources/etc/defaultConfig.json create mode 100644 packages/policy-xacmlpdp-tarball/src/main/resources/etc/logback.xml create mode 100644 packages/policy-xacmlpdp-tarball/src/main/resources/etc/s3pConfig.json create mode 100644 packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-keystore create mode 100644 packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-truststore create mode 100644 packages/pom.xml (limited to 'packages') diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml new file mode 100644 index 00000000..bc45b3fb --- /dev/null +++ b/packages/policy-xacmlpdp-docker/pom.xml @@ -0,0 +1,176 @@ + + + + + 4.0.0 + + org.onap.policy.xacml-pdp + packages + 2.0.0-SNAPSHOT + + + pom + policy-xacmlpdp-docker + + ${project.artifactId} + Creates Policy Xacml PDP docker images + + + UTF-8 + UTF-8 + ${project.version} + false + false + false + nexus3.onap.org:10001 + nexus3.onap.org:10003 + yyyyMMdd'T'HHmm + + + + ${project.artifactId}-${project.version} + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + + println 'Project version: ' + project.properties['pdpx.project.version']; + def versionArray; + if ( project.properties['pdpx.project.version'] != null ) { + versionArray = project.properties['pdpx.project.version'].split('-'); + } + + if ( project.properties['pdpx.project.version'].endsWith("-SNAPSHOT") ) { + project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest"; + } else { + project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest"; + } + + println 'New tag for docker: ' + project.properties['project.docker.latesttag.version']; + + + + + + + + io.fabric8 + docker-maven-plugin + 0.19.1 + + + true + 1.23 + ${docker.pull.registry} + ${docker.push.registry} + + + + onap/policy-xacml-pdp + + try + Dockerfile + + ${project.version} + ${project.version}-${maven.build.timestamp} + ${project.docker.latesttag.version} + + + + + + + org.onap.policy.xacmlpdp:policy-xacmlpdp-tarball + + /lib + policy-xacmlpdp.tar.gz + + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + + generate-images + generate-sources + + build + + + + + push-images + deploy + + build + push + + + onap/policy-xacmp-pdp + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + + org.onap.policy.xacml-pdp + policy-xacmlpdp-tarball + ${project.version} + tarball + tar.gz + + + diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile new file mode 100644 index 00000000..b5f8af30 --- /dev/null +++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile @@ -0,0 +1,46 @@ +FROM ubuntu:16.04 + +ARG HTTP_PROXY=${HTTP_PROXY} +ARG HTTPS_PROXY=${HTTPS_PROXY} +ARG BUILD_VERSION=${BUILD_VERSION} +ARG POLICY_LOGS=/var/log/onap/policy/pdpx + +ENV http_proxy $HTTP_PROXY +ENV https_proxy $HTTPS_PROXY +ENV BUILD_VERSION ${BUILD_VERSION} +ENV POLICY_LOGS ${POLICY_LOGS} + +ENV POLICY_HOME=/opt/app/policy +ENV POLICY_PDPX_HOME=${POLICY_HOME}/pdpx + +RUN \ + apt-get clean && \ + apt-get update && \ + apt-get install -y zip unzip curl wget ssh telnet maven && \ + apt-get install -y software-properties-common && \ + apt-get install -y jq httpie && \ + apt-get install -y python-pip && \ + add-apt-repository ppa:openjdk-r/ppa && \ + apt-get clean && \ + apt-get update && \ + apt-get install -y openjdk-8-jdk + +RUN groupadd policy +RUN useradd --create-home --shell /bin/bash -g policy policy + +RUN mkdir -p ${POLICY_PDPX_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_PDPX_HOME}/bin && \ + chown -R policy:policy ${POLICY_HOME} ${POLICY_PDPX_HOME} ${POLICY_LOGS} + +RUN mkdir /packages +COPY /maven/* /packages +RUN tar xvfz /packages/policy-xacml-pdp.tar.gz --directory ${POLICY_PDPX_HOME} +RUN rm /packages/policy-xacml-pdp.tar.gz + +WORKDIR ${POLICY_PDPX_HOME} +COPY policy-pdpx.sh bin/. +RUN chown -R policy:policy * && chmod +x bin/*.sh +RUN cp ${POLICY_PDPX_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl && chown policy:policy ${POLICY_HOME}/etc/ssl/* + +USER policy +WORKDIR ${POLICY_PDPX_HOME}/bin +ENTRYPOINT [ "bash", "./policy-pdpx.sh" ] diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh new file mode 100644 index 00000000..aff8d8e0 --- /dev/null +++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# +# ============LICENSE_START======================================================= +# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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========================================================= +# + +JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ +POLICY_PDPX_HOME=/opt/app/policy/pdpx +KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" +KEYSTORE_PASSWD="Pol1cy_0nap" +TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore" +TRUSTSTORE_PASSWD="Pol1cy_0nap" + + +if [ "$#" -eq 1 ]; then + CONFIG_FILE=$1 +else + CONFIG_FILE=${CONFIG_FILE} +fi + +if [ -z "$CONFIG_FILE" ] + then + CONFIG_FILE="$POLICY_PDPX_HOME/etc/defaultConfig.json" +fi + +echo "Policy Xacml PDP config file: $CONFIG_FILE" + +$JAVA_HOME/bin/java -cp "$POLICY_PDPX_HOME/etc:$POLICY_PDPX_HOME/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.xacmlpdp.main.startstop.Main -c $CONFIG_FILE diff --git a/packages/policy-xacmlpdp-tarball/pom.xml b/packages/policy-xacmlpdp-tarball/pom.xml new file mode 100644 index 00000000..2605d942 --- /dev/null +++ b/packages/policy-xacmlpdp-tarball/pom.xml @@ -0,0 +1,65 @@ + + + + 4.0.0 + + org.onap.policy.xacml-pdp + packages + 2.0.0-SNAPSHOT + + + policy-xacmlpdp-tarball + ${project.artifactId} + Creates the zip pacakge of entire Xacml PDP component + + + + org.onap.policy.xacml-pdp + main + ${project.version} + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + generate-complete-tar + package + + single + + + + src/main/package/tarball/assembly.xml + + ${project.artifactId}-${project.version} + + + + + + + diff --git a/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml b/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml new file mode 100644 index 00000000..4c76c5a9 --- /dev/null +++ b/packages/policy-xacmlpdp-tarball/src/main/package/tarball/assembly.xml @@ -0,0 +1,70 @@ + + + + tarball + + tar.gz + + false + + + true + /lib + false + runtime + + *:jar + + + + + + ${project.basedir}/src/main/resources + + policyLogger.properties + + /bin/config + unix + + + ${project.basedir}/src/main/resources/etc + + + *.json + *.xml + + /etc + unix + + *.formatted + + + + ${project.basedir}/src/main/resources/etc/ssl + + + policy* + + /etc/ssl + keep + + + diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/etc/defaultConfig.json b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/defaultConfig.json new file mode 100644 index 00000000..561574a2 --- /dev/null +++ b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/defaultConfig.json @@ -0,0 +1,11 @@ +{ + "name": "XacmlPdpGroup", + "restServerParameters": { + "host": "0.0.0.0", + "port": 6969, + "userName": "healthcheck", + "password": "zb!XztG34", + "https": true, + "aaf": false + } +} diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/etc/logback.xml b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/logback.xml new file mode 100644 index 00000000..6f825611 --- /dev/null +++ b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/logback.xml @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + ${logDir}/${errorLog}.log + + ${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + WARN + + + ${errorPattern} + + + + + + + + + ${logDir}/${debuLog}.log + + ${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip + 50MB + 30 + 10GB + + + DEBUG + + + ${debugPattern} + + + + + + + + + ${logDir}/${metricsLog}.log + + ${logDir}/${metricsLog}.%d{yyyy-MM-dd}.%i.log.zip + 50MB + 30 + 10GB + + + ${metricPattern} + + + + + + + + + ${logDir}/${networkLog}.log + + ${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + ${networkPattern} + + + + + + + + + ${logDir}/${transactionLog}.log + + ${logDir}/${transactionLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + ${transactionPattern} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/etc/s3pConfig.json b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/s3pConfig.json new file mode 100644 index 00000000..54be41a7 --- /dev/null +++ b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/s3pConfig.json @@ -0,0 +1,11 @@ +{ + "name":"XacmlPdpGroup", + "restServerParameters":{ + "host":"0.0.0.0", + "port":6969, + "userName":"healthcheck", + "password":"zb!XztG34", + "https": true, + "aaf": false + } +} diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-keystore b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-keystore new file mode 100644 index 00000000..7d2b1ecc Binary files /dev/null and b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-keystore differ diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-truststore b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-truststore new file mode 100644 index 00000000..8834ac25 Binary files /dev/null and b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-truststore differ diff --git a/packages/pom.xml b/packages/pom.xml new file mode 100644 index 00000000..34bdbe85 --- /dev/null +++ b/packages/pom.xml @@ -0,0 +1,54 @@ + + + + 4.0.0 + + org.onap.policy.xacml-pdp + policy-xacml-pdp + 2.0.0-SNAPSHOT + + + packages + pom + + ${project.artifactId} + The module for packaging the Xacml PDP component + + + + default + + true + + + + docker + + policy-xacmlpdp-tarball + policy-xacmlpdp-docker + + + false + + + + -- cgit 1.2.3-korg