summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jorge.hernandez-herrero@att.com>2019-03-07 14:53:45 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-07 14:53:45 +0000
commit46eea647c1e44f7d87642bab422e2f963fcdbf69 (patch)
tree5cd8949d252f2cd9103e66293b6cd815622afcb8
parent0c5e1571b5ba2d5f5d3941f22b46f13a02f92351 (diff)
parent898328809b39aef19753659cae63f332ef2d2584 (diff)
Merge "Use Alpine as base docker image in /policy/pap"
-rw-r--r--packages/policy-pap-docker/src/main/docker/Dockerfile28
-rw-r--r--packages/policy-pap-docker/src/main/docker/policy-pap.sh2
2 files changed, 10 insertions, 20 deletions
diff --git a/packages/policy-pap-docker/src/main/docker/Dockerfile b/packages/policy-pap-docker/src/main/docker/Dockerfile
index 727cab28..706df22d 100644
--- a/packages/policy-pap-docker/src/main/docker/Dockerfile
+++ b/packages/policy-pap-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}
@@ -13,33 +13,23 @@ ENV POLICY_LOGS ${POLICY_LOGS}
ENV POLICY_HOME=/opt/app/policy
ENV POLICY_PAP_HOME=${POLICY_HOME}/pap
-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 maven openjdk8 jq httpie py-pip
+
+RUN addgroup -S policy && \
+ adduser -S --shell /bin/bash -G policy policy
RUN mkdir -p ${POLICY_PAP_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_PAP_HOME}/bin && \
chown -R policy:policy ${POLICY_HOME} ${POLICY_PAP_HOME} ${POLICY_LOGS}
RUN mkdir /packages
COPY /maven/* /packages
-RUN tar xvfz /packages/policy-pap.tar.gz --directory ${POLICY_PAP_HOME}
-RUN rm /packages/policy-pap.tar.gz
+RUN tar xvfz /packages/policy-pap.tar.gz --directory ${POLICY_PAP_HOME} \
+ && rm /packages/policy-pap.tar.gz
WORKDIR ${POLICY_PAP_HOME}
COPY policy-pap.sh bin/.
-RUN chown -R policy:policy * && chmod +x bin/*.sh
-RUN cp ${POLICY_PAP_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_PAP_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl && chown policy:policy ${POLICY_HOME}/etc/ssl/*
USER policy
WORKDIR ${POLICY_PAP_HOME}/bin
diff --git a/packages/policy-pap-docker/src/main/docker/policy-pap.sh b/packages/policy-pap-docker/src/main/docker/policy-pap.sh
index 7387b9d0..6bd53780 100644
--- a/packages/policy-pap-docker/src/main/docker/policy-pap.sh
+++ b/packages/policy-pap-docker/src/main/docker/policy-pap.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_PAP_HOME=/opt/app/policy/pap
KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore"
KEYSTORE_PASSWD="Pol1cy_0nap"