summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jorge.hernandez-herrero@att.com>2019-04-24 15:02:02 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-24 15:02:02 +0000
commita6cb1f27c8fe26b02abbd6a3fcf876ec306e6a5a (patch)
tree0200324f51dafc62a6deab1bef6ea5733e99a52a
parentb13e905e3de91ac7a018f61a95064c170821329e (diff)
parent693d189d3cb7c438a3a04e59b9d90c6fc012438e (diff)
Merge "Rebase image on policy-common-alpine"
-rw-r--r--packages/policy-pap-docker/pom.xml2
-rw-r--r--packages/policy-pap-docker/src/main/docker/Dockerfile22
2 files changed, 6 insertions, 18 deletions
diff --git a/packages/policy-pap-docker/pom.xml b/packages/policy-pap-docker/pom.xml
index b4d893c0..f4515229 100644
--- a/packages/policy-pap-docker/pom.xml
+++ b/packages/policy-pap-docker/pom.xml
@@ -88,7 +88,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-pap-docker/src/main/docker/Dockerfile b/packages/policy-pap-docker/src/main/docker/Dockerfile
index 0870fbf5..4bff78e2 100644
--- a/packages/policy-pap-docker/src/main/docker/Dockerfile
+++ b/packages/policy-pap-docker/src/main/docker/Dockerfile
@@ -1,26 +1,14 @@
-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/pap
-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_PAP_HOME=${POLICY_HOME}/pap
-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 -S policy && \
- adduser -S --shell /bin/bash -G policy policy
-
-RUN mkdir -p ${POLICY_PAP_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_PAP_HOME}/bin && \
- chown -R policy:policy ${POLICY_HOME} ${POLICY_PAP_HOME} ${POLICY_LOGS}
+RUN mkdir -p ${POLICY_PAP_HOME} ${POLICY_LOGS} ${POLICY_PAP_HOME}/bin && \
+ chown -R policy:policy ${POLICY_PAP_HOME} ${POLICY_LOGS}
RUN mkdir /packages
COPY /maven/* /packages