From de579e42a1daef260a01404b2bb8040b82d8c480 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Thu, 16 Jan 2020 10:41:56 -0500
Subject: 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>
---
 policy-jre/alpine/src/main/docker/Dockerfile | 12 ++++++++----
 policy-jre/pom.xml                           |  5 +----
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'policy-jre')

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>
-- 
cgit 1.2.3-korg