From 2087dfbdc3e4c006a04fd6be02d2201803dff124 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 16 Sep 2019 21:46:52 +0200
Subject: rename ubi7 -> rhel7, tweak install

---
 Dockerfile.rhel7 | 41 +++++++++++++++++++++++++++++++++++++++++
 Dockerfile.ubi7  | 41 -----------------------------------------
 2 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 Dockerfile.rhel7
 delete mode 100644 Dockerfile.ubi7

diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
new file mode 100644
index 0000000..3a39e1c
--- /dev/null
+++ b/Dockerfile.rhel7
@@ -0,0 +1,41 @@
+# kraxel/s2i-jekyll
+FROM rhscl/httpd-24-rhel7
+
+ENV RH_RUBY_VERSION="25" \
+    JEKYLL_VERSION="3.8.5" \
+    SUMMARY="Jekyll ${JEKYLL_VERSION}" \
+    DESCRIPTION="Platform for building static jekyll sites (ubi7)"
+
+LABEL maintainer="Gerd Hoffmann <kraxel@redhat.com>" \
+      summary="${SUMMARY}" \
+      description="${DESCRIPTION}" \
+      io.k8s.display-name="${SUMMARY}" \
+      io.k8s.description="${DESCRIPTION}" \
+      io.openshift.expose-services="8080:http" \
+      io.openshift.tags="jekyll,static"
+
+USER root
+
+RUN yum install -y yum-utils && \
+    prepare-yum-repositories rhel-server-rhscl-7-rpms && \
+    yum install -y make gcc gcc-c++ binutils \
+                   glibc-devel openssl-devel \
+                   rh-ruby${RH_RUBY_VERSION} \
+                   rh-ruby${RH_RUBY_VERSION}-ruby-devel \
+                   rh-ruby${RH_RUBY_VERSION}-rubygem-bundler && \
+    yum clean all -y
+
+RUN for file in /usr/libexec/s2i/*; do cp -v $file ${file}.httpd; done
+COPY ./s2i/bin/ /usr/libexec/s2i
+COPY ./etc/scl_enable /etc/
+COPY ./etc/jekyll-documentroot.conf /etc/httpd/conf.d/
+
+ENV BASH_ENV="/etc/scl_enable"
+
+RUN source /etc/scl_enable; \
+    gem install jekyll --version "= $JEKYLL_VERSION"
+
+USER 1001
+EXPOSE 8080
+
+CMD ["/usr/libexec/s2i/usage"]
diff --git a/Dockerfile.ubi7 b/Dockerfile.ubi7
deleted file mode 100644
index e517c14..0000000
--- a/Dockerfile.ubi7
+++ /dev/null
@@ -1,41 +0,0 @@
-# kraxel/s2i-jekyll
-FROM rhscl/httpd-24-rhel7
-
-ENV RH_RUBY_VERSION="25" \
-    JEKYLL_VERSION="3.8.5" \
-    SUMMARY="Jekyll ${JEKYLL_VERSION}" \
-    DESCRIPTION="Platform for building static jekyll sites (ubi7)"
-
-LABEL maintainer="Gerd Hoffmann <kraxel@redhat.com>" \
-      summary="${SUMMARY}" \
-      description="${DESCRIPTION}" \
-      io.k8s.display-name="${SUMMARY}" \
-      io.k8s.description="${DESCRIPTION}" \
-      io.openshift.expose-services="8080:http" \
-      io.openshift.tags="jekyll,static"
-
-USER root
-
-RUN yum --disable-plugin=subscription-manager \
-        install -y make gcc gcc-c++ binutils \
-                   glibc-devel openssl-devel \
-                   rh-ruby${RH_RUBY_VERSION} \
-                   rh-ruby${RH_RUBY_VERSION}-ruby-devel \
-                   rh-ruby${RH_RUBY_VERSION}-rubygem-bundler && \
-    yum --disable-plugin=subscription-manager \
-        clean all -y
-
-RUN for file in /usr/libexec/s2i/*; do cp -v $file ${file}.httpd; done
-COPY ./s2i/bin/ /usr/libexec/s2i
-COPY ./etc/scl_enable /etc/
-COPY ./etc/jekyll-documentroot.conf /etc/httpd/conf.d/
-
-ENV BASH_ENV="/etc/scl_enable"
-
-RUN source /etc/scl_enable; \
-    gem install jekyll --version "= $JEKYLL_VERSION"
-
-USER 1001
-EXPOSE 8080
-
-CMD ["/usr/libexec/s2i/usage"]
-- 
cgit