summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Puzikov <dmitry.puzikov@tieto.com>2019-03-26 09:24:50 +0100
committerDmitry Puzikov <dmitry.puzikov@tieto.com>2019-04-26 14:21:55 +0200
commit74ced993d23d84cc12af2978d8c9c3916a6a518b (patch)
treef6d6478045514cfbc8def7160701ae51453e38a6
parentae182a04e4bf5c05bebcefe71d1fd000363aab09 (diff)
Rebase image on policy-common-alpine
Issue-ID: INT-1003 Change-Id: I671156732399a8cd6f4a68e29f35112b8aa7657f Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
-rw-r--r--packages/policy-xacmlpdp-docker/pom.xml2
-rw-r--r--packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile19
2 files changed, 5 insertions, 16 deletions
diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml
index 08791167..97789a28 100644
--- a/packages/policy-xacmlpdp-docker/pom.xml
+++ b/packages/policy-xacmlpdp-docker/pom.xml
@@ -83,7 +83,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.19.1</version>
+ <version>0.28.0</version>
<configuration>
<verbose>true</verbose>
diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
index 3732e589..21e311e1 100644
--- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
@@ -1,26 +1,15 @@
-FROM alpine:3.9
+FROM onap/policy-common-alpine:1.4.0
+
+LABEL maintainer="Policy Team"
-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/pdpx
-RUN \
- apk add --no-cache --update busybox-extras bash nss procps coreutils findutils grep \
- zip unzip curl wget openssh maven openjdk8 jq httpie py-pip
-
-RUN addgroup policy && \
- adduser -S --shell /bin/bash -G policy policy
-
RUN mkdir -p ${POLICY_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_HOME}/bin ${POLICY_HOME}/apps && \
- chown -R policy:policy ${POLICY_HOME} ${POLICY_LOGS}
+ chown -R policy:policy ${POLICY_HOME} ${POLICY_LOGS}
RUN mkdir /packages
COPY /maven/* /packages