diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-03-25 15:16:04 +0100 |
|---|---|---|
| committer | Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-04-24 09:57:06 +0200 |
| commit | 39bac7ed034c56eeb2b19a1b274fab35dbc9818f (patch) | |
| tree | abf714ee7b668100b2f77fd05d1c8745d16b1789 | |
| parent | e0936d1bf5b7241eb1543c762b86bf72951870b3 (diff) | |
Rebase image on policy-common-alpine
Added exact version of base image
Issue-ID: INT-999
Change-Id: I149b92c6e28d0dd325f9601a6aa979767d0a2e9b
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
| -rw-r--r-- | packages/policy-distribution-docker/pom.xml | 2 | ||||
| -rw-r--r-- | packages/policy-distribution-docker/src/main/docker/Dockerfile | 25 |
2 files changed, 8 insertions, 19 deletions
diff --git a/packages/policy-distribution-docker/pom.xml b/packages/policy-distribution-docker/pom.xml index 45a4621d..79c305fb 100644 --- a/packages/policy-distribution-docker/pom.xml +++ b/packages/policy-distribution-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-distribution-docker/src/main/docker/Dockerfile b/packages/policy-distribution-docker/src/main/docker/Dockerfile index ff520155..db26c161 100644 --- a/packages/policy-distribution-docker/src/main/docker/Dockerfile +++ b/packages/policy-distribution-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/distribution -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_DISTRIBUTION_HOME=${POLICY_HOME}/distribution -RUN apk add --no-cache --update busybox-extras bash nss procps coreutils findutils grep zip unzip \ - curl wget openssh openjdk8 maven jq httpie py-pip - -RUN addgroup -S policy && \ - adduser -S --shell /bin/bash -G policy policy - -RUN mkdir -p ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_DISTRIBUTION_HOME}/bin && \ - chown -R policy:policy ${POLICY_HOME} ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} +RUN mkdir -p ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} ${POLICY_DISTRIBUTION_HOME}/bin && \ + chown -R policy:policy ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} RUN mkdir /packages COPY /maven/* /packages @@ -30,7 +18,8 @@ RUN tar xvfz /packages/policy-distribution.tar.gz --directory ${POLICY_DISTRIBUT WORKDIR ${POLICY_DISTRIBUTION_HOME} COPY policy-dist.sh bin/. RUN chown -R policy:policy * && chmod +x bin/*.sh \ - && cp ${POLICY_DISTRIBUTION_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl && chown policy:policy ${POLICY_HOME}/etc/ssl/* + && cp ${POLICY_DISTRIBUTION_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl \ + && chown policy:policy ${POLICY_HOME}/etc/ssl/* USER policy WORKDIR ${POLICY_DISTRIBUTION_HOME}/bin |