diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-01-16 10:41:56 -0500 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-01-16 12:13:21 -0500 |
| commit | de579e42a1daef260a01404b2bb8040b82d8c480 (patch) | |
| tree | 19743553b30966e7610e3d66ec6ee7343864deac | |
| parent | 8db243af9793c7d54ca2547ac0785897846d17db (diff) | |
Re-add alpine docker images
Split the RUN into separate items in an attempt to get past the
sporadic I/O Error when building the policy alpine docker images.
Updates per review comments:
- removed nss
- removed openssh (for now)
Issue-ID: POLICY-1586
Change-Id: I9e6181e67333a5fdf01c8a4286f117b673e50076
Signed-off-by: Jim Hahn <jrh3@att.com>
| -rw-r--r-- | policy-jdk/alpine/src/main/docker/Dockerfile | 16 | ||||
| -rw-r--r-- | policy-jdk/pom.xml | 5 | ||||
| -rw-r--r-- | policy-jre/alpine/src/main/docker/Dockerfile | 12 | ||||
| -rw-r--r-- | policy-jre/pom.xml | 5 |
4 files changed, 21 insertions, 17 deletions
diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile index a258a314..330e54f5 100644 --- a/policy-jdk/alpine/src/main/docker/Dockerfile +++ b/policy-jdk/alpine/src/main/docker/Dockerfile @@ -28,6 +28,10 @@ LABEL maintainer="Policy Team" ENV POLICY_HOME=/opt/app/policy +# +# When these are done via a single "RUN", I/O errors occur sporadically, +# thus they have been split into separate RUNs. +# RUN apk update \ && apk add --no-cache \ bash \ @@ -38,16 +42,18 @@ RUN apk update \ grep \ httpie \ jq \ - maven \ - nss \ - openjdk11 \ - openssh \ procps \ py-pip \ python \ unzip \ wget \ - zip \ + zip + +RUN apk add --no-cache \ + maven + +RUN apk add --no-cache \ + openjdk11 \ && addgroup -S policy \ && adduser -S --shell /bin/bash -G policy policy \ && mkdir -p ${POLICY_HOME}/etc/ssl \ diff --git a/policy-jdk/pom.xml b/policy-jdk/pom.xml index e02d1d1b..130784b2 100644 --- a/policy-jdk/pom.xml +++ b/policy-jdk/pom.xml @@ -29,7 +29,7 @@ <artifactId>policy-jdk</artifactId> <packaging>pom</packaging> - <name>Policy Common Docker images</name> + <name>Policy JDK Docker images</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -47,10 +47,7 @@ <profile> <id>docker</id> <modules> - <!-- pretty frequently, alpine fails to build, so removing - it for now <module>alpine</module> - --> <module>debian-slim</module> </modules> </profile> diff --git a/policy-jre/alpine/src/main/docker/Dockerfile b/policy-jre/alpine/src/main/docker/Dockerfile index 72704140..169e280e 100644 --- a/policy-jre/alpine/src/main/docker/Dockerfile +++ b/policy-jre/alpine/src/main/docker/Dockerfile @@ -28,6 +28,10 @@ LABEL maintainer="Policy Team" ENV POLICY_HOME=/opt/app/policy +# +# When these are done via a single "RUN", I/O errors occur sporadically, +# thus they have been split into separate RUNs. +# RUN apk update \ && apk add --no-cache \ bash \ @@ -38,15 +42,15 @@ RUN apk update \ grep \ httpie \ jq \ - nss \ - openjdk11-jre \ - openssh \ procps \ py-pip \ python \ unzip \ wget \ - zip \ + zip + +RUN apk add --no-cache \ + openjdk11-jre \ && addgroup -S policy \ && adduser -S --shell /bin/bash -G policy policy \ && mkdir -p ${POLICY_HOME}/etc/ssl \ diff --git a/policy-jre/pom.xml b/policy-jre/pom.xml index cc0d588d..3a0ae4e4 100644 --- a/policy-jre/pom.xml +++ b/policy-jre/pom.xml @@ -29,7 +29,7 @@ <artifactId>policy-jre</artifactId> <packaging>pom</packaging> - <name>Policy Base Docker images</name> + <name>Policy JRE Docker images</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -46,10 +46,7 @@ <profile> <id>docker</id> <modules> - <!-- pretty frequently, alpine fails to build, so removing - it for now <module>alpine</module> - --> <module>debian-slim</module> </modules> </profile> |