diff options
| author |   shaoqiu <tim.huang@est.tech> | 2019-03-07 05:39:37 +0000 |
|---|---|---|
| committer | shaoqiu <tim.huang@est.tech> | 2019-03-07 05:39:37 +0000 |
| commit | ad591dfe23c04c625187aa5af191fe76bd699144 (patch) | |
| tree | 40e075def93cdbd7274bcea2ef9a1c5d8db39c9a /packages | |
| parent | a02659636fbfad2c3cb970d93f35e02a892409e5 (diff) | |
Use Alpine as base docker image in xacml-pdp
Issue-ID: POLICY-1554
Change-Id: Ia80f01317f2f224e55ddc18139ac49ca19883cd1
Signed-off-by: shaoqiu <tim.huang@est.tech>
Diffstat (limited to 'packages')
3 files changed, 13 insertions, 20 deletions
diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile index df42ca75..497efc57 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile +++ b/packages/policy-xacmlpdp-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_PDPX_HOME=${POLICY_HOME}/pdpx 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 policy && \ + adduser -S --shell /bin/bash -G policy policy RUN mkdir -p ${POLICY_PDPX_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_PDPX_HOME}/bin && \ chown -R policy:policy ${POLICY_HOME} ${POLICY_PDPX_HOME} ${POLICY_LOGS} RUN mkdir /packages COPY /maven/* /packages -RUN tar xvfz /packages/policy-xacmlpdp.tar.gz --directory ${POLICY_PDPX_HOME} -RUN rm /packages/policy-xacmlpdp.tar.gz +RUN tar xvfz /packages/policy-xacmlpdp.tar.gz --directory ${POLICY_PDPX_HOME} && \ + rm /packages/policy-xacmlpdp.tar.gz WORKDIR ${POLICY_PDPX_HOME} COPY policy-pdpx.sh bin/. -RUN chown -R policy:policy * && chmod +x bin/*.sh -RUN cp ${POLICY_PDPX_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_PDPX_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl && chown policy:policy ${POLICY_HOME}/etc/ssl/* USER policy WORKDIR ${POLICY_PDPX_HOME}/bin diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh index a56e5fea..4ffa8087 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh +++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.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_PDPX_HOME=/opt/app/policy/pdpx KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/etc/logback.xml b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/logback.xml index 6f825611..83e13d7f 100644 --- a/packages/policy-xacmlpdp-tarball/src/main/resources/etc/logback.xml +++ b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/logback.xml @@ -140,7 +140,7 @@ <appender-ref ref="asyncDebugOut" /> </logger> - <logger name="network" level=info" additivity="false"> + <logger name="network" level="info" additivity="false"> <appender-ref ref="asyncNetworkOut" /> </logger> |