diff options
| author |   ning.xi <ning.xi@est.tech> | 2019-03-06 03:32:53 +0000 |
|---|---|---|
| committer | ning.xi <ning.xi@est.tech> | 2019-03-06 03:32:53 +0000 |
| commit | 11319a19c8c68276b9e3aa49c261f83679a5675e (patch) | |
| tree | 20f0cc42b882c1be472e6067b1ec747acbb000a8 | |
| parent | 8acfc604a2179f7290daf4e088eb7e4acae8df56 (diff) | |
Use Alpine as base docker image in distribution
Issue-ID: POLICY-1550
Change-Id: I16801ad4fa0c2db578a9d1e41adef053df5074be
Signed-off-by: ning.xi <ning.xi@est.tech>
| -rw-r--r-- | packages/policy-distribution-docker/src/main/docker/Dockerfile | 28 | ||||
| -rw-r--r-- | packages/policy-distribution-docker/src/main/docker/policy-dist.sh | 2 |
2 files changed, 10 insertions, 20 deletions
diff --git a/packages/policy-distribution-docker/src/main/docker/Dockerfile b/packages/policy-distribution-docker/src/main/docker/Dockerfile index 1a55e6c7..da2eceb0 100644 --- a/packages/policy-distribution-docker/src/main/docker/Dockerfile +++ b/packages/policy-distribution-docker/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM alpine:3.9 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -13,33 +13,23 @@ ENV POLICY_LOGS ${POLICY_LOGS} ENV POLICY_HOME=/opt/app/policy ENV POLICY_DISTRIBUTION_HOME=${POLICY_HOME}/distribution -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 apk add --no-cache --update busybox-extras bash 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 /packages COPY /maven/* /packages -RUN tar xvfz /packages/policy-distribution.tar.gz --directory ${POLICY_DISTRIBUTION_HOME} -RUN rm /packages/policy-distribution.tar.gz +RUN tar xvfz /packages/policy-distribution.tar.gz --directory ${POLICY_DISTRIBUTION_HOME} \ + && rm /packages/policy-distribution.tar.gz WORKDIR ${POLICY_DISTRIBUTION_HOME} COPY policy-dist.sh bin/. -RUN chown -R policy:policy * && chmod +x bin/*.sh -RUN cp ${POLICY_DISTRIBUTION_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl && chown policy:policy ${POLICY_HOME}/etc/ssl/* +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/* USER policy WORKDIR ${POLICY_DISTRIBUTION_HOME}/bin diff --git a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh index 5ea7d83c..63879e3e 100644 --- a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh +++ b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh @@ -19,7 +19,7 @@ # ============LICENSE_END========================================================= # -JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ +JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ POLICY_DISTRIBUTION_HOME=/opt/app/policy/distribution KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" |