From 633e2bfc152b71ac0662b9cae3d97cd6ad8bad23 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 16 Sep 2019 21:30:55 +0200
Subject: ubi7: switch base image

---
 Dockerfile.ubi7 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.ubi7 b/Dockerfile.ubi7
index 001fae2..4a670c1 100644
--- a/Dockerfile.ubi7
+++ b/Dockerfile.ubi7
@@ -1,5 +1,5 @@
 # kraxel/s2i-jekyll
-FROM registry.access.redhat.com/ubi7/ruby-25
+FROM rhscl/httpd-24-rhel7
 
 ENV RH_RUBY_VERSION="25" \
     JEKYLL_VERSION="3.8.5"
@@ -12,6 +12,15 @@ LABEL maintainer="Gerd Hoffmann <kraxel@redhat.com>" \
 
 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/
-- 
cgit