summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshaoqiu <tim.huang@est.tech>2019-03-06 05:37:04 +0000
committershaoqiu <tim.huang@est.tech>2019-03-06 05:37:04 +0000
commitf626b9f2f27f713f00d60a6f36974b2632da83be (patch)
treeac0cfe65fc692f5406747cdcb0385be1856130b6
parentd544e813c5fee91f3c2b61e6cfcf1c48b83ab82b (diff)
Use Alpine as base docker image in /policy/api
Issue-ID: POLICY-1549 Change-Id: I422ea3d70469dc6d2a840c5ce3aa70117f83864f Signed-off-by: shaoqiu <tim.huang@est.tech>
-rw-r--r--packages/policy-api-docker/src/main/docker/Dockerfile29
-rw-r--r--packages/policy-api-docker/src/main/docker/policy-api.sh2
2 files changed, 12 insertions, 19 deletions
diff --git a/packages/policy-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile
index 95d2558d..ab419963 100644
--- a/packages/policy-api-docker/src/main/docker/Dockerfile
+++ b/packages/policy-api-docker/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM alpine:3.9
ARG HTTP_PROXY=${HTTP_PROXY}
ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -14,32 +14,25 @@ ENV POLICY_HOME=/opt/app/policy
ENV POLICY_API_HOME=${POLICY_HOME}/api
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
+ apk add --no-cache --update busybox-extras bash 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 /packages
COPY /maven/* /packages
-RUN tar xvfz /packages/policy-api.tar.gz --directory ${POLICY_API_HOME}
-RUN rm /packages/policy-api.tar.gz
+RUN tar xvfz /packages/policy-api.tar.gz --directory ${POLICY_API_HOME} && \
+ rm /packages/policy-api.tar.gz
WORKDIR ${POLICY_API_HOME}
COPY policy-api.sh bin/.
-RUN chown -R policy:policy * && chmod +x bin/*.sh
-RUN cp ${POLICY_API_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_API_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl && chown policy:policy ${POLICY_HOME}/etc/ssl/*
USER policy
WORKDIR ${POLICY_API_HOME}/bin
diff --git a/packages/policy-api-docker/src/main/docker/policy-api.sh b/packages/policy-api-docker/src/main/docker/policy-api.sh
index 21d8326b..dad02fdf 100644
--- a/packages/policy-api-docker/src/main/docker/policy-api.sh
+++ b/packages/policy-api-docker/src/main/docker/policy-api.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_API_HOME=/opt/app/policy/api
KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore"
KEYSTORE_PASSWD="Pol1cy_0nap"