diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-03-25 15:00:06 +0100 |
|---|---|---|
| committer | Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-04-24 10:06:20 +0200 |
| commit | a0745a7abc6583691f2dc9c8282253d2af92d57a (patch) | |
| tree | 807a40fbbcd90a2b5e47d0b380e894094cb316f2 | |
| parent | 7e229d26155465d163283e53968d2b20ddebefd1 (diff) | |
Rebase api image on policy-common-alpine
Issue-ID: INT-998
Change-Id: I7d128035bb94db860036d9f80151439e79aac8f6
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
| -rw-r--r-- | packages/policy-api-docker/pom.xml | 2 | ||||
| -rw-r--r-- | packages/policy-api-docker/src/main/docker/Dockerfile | 24 |
2 files changed, 6 insertions, 20 deletions
diff --git a/packages/policy-api-docker/pom.xml b/packages/policy-api-docker/pom.xml index e918513b..83fd1fe4 100644 --- a/packages/policy-api-docker/pom.xml +++ b/packages/policy-api-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-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile index d14ebd11..5633ecc1 100644 --- a/packages/policy-api-docker/src/main/docker/Dockerfile +++ b/packages/policy-api-docker/src/main/docker/Dockerfile @@ -1,28 +1,14 @@ -FROM alpine:3.9 +FROM onap/policy-common-alpine + +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/api -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_API_HOME=${POLICY_HOME}/api -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_API_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_API_HOME}/bin && \ - chown -R policy:policy ${POLICY_HOME} ${POLICY_API_HOME} ${POLICY_LOGS} +RUN mkdir -p ${POLICY_LOGS} ${POLICY_API_HOME} ${POLICY_API_HOME}/bin && \ + chown -R policy:policy ${POLICY_API_HOME} RUN mkdir /packages COPY /maven/* /packages |