Merge pull request #122 from dmhumph/atomic

Update to atomic as base image

s2i-play/Dockerfile

@@ -1,4 +1,4 @@
-FROM rhel7.4
+FROM rhel7-atomic
 
 MAINTAINER Andrew Block <[email protected]>
 
@@ -14,9 +14,10 @@ ENV ACTIVATOR_VERSION=1.3.10 \
 
 COPY s2i /usr/libexec/s2i
 
-RUN INSTALL_PKGS="tar unzip bc which lsof java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \
-    yum install -y $INSTALL_PKGS && \
-    yum clean all && \
+RUN INSTALL_PKGS="tar unzip bc gzip which lsof shadow-utils java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \
+    microdnf --enablerepo=rhel-7-server-rpms install -y $INSTALL_PKGS && \
+    microdnf update && \
+    microdnf clean all && \
     useradd -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \
         -c "Default Application User" default && \
     mkdir -p ${HOME} /opt/activator /opt/s2i/destination/src/ /deployments && \

s2i-play/applier/templates/build.yml

@@ -14,9 +14,9 @@ objects:
   metadata:
     labels:
       build: ${PLAY_BUILDER_NAME}
-    name: rhel7
+    name: rhel7-atomic
   spec:
-    dockerImageRepository: registry.access.redhat.com/rhel7/rhel
+    dockerImageRepository: registry.access.redhat.com/rhel7-atomic
 - apiVersion: v1
   kind: ImageStream
   metadata:
@@ -51,7 +51,7 @@ objects:
         dockerFilePath: Dockerfile
         from:
           kind: ImageStreamTag
-          name: rhel7:7.4
+          name: rhel7-atomic:7.5
       type: Docker
     triggers:
     - type: ConfigChange