switch to openshift/httpd base image

1 files changed, 2 insertions, 16 deletions

diff --git a/Dockerfile b/Dockerfile
index 0541759..a522b50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # kraxel/s2i-jekyll
-FROM openshift/base-centos7
+FROM openshift/httpd:24
 
 LABEL maintainer="Gerd Hoffmann <kraxel@redhat.com>"
 
@@ -12,8 +12,7 @@ LABEL io.k8s.description="Platform for building static jekyll sites" \
       io.openshift.tags="jekyll,static"
 
 RUN yum install -y centos-release-scl && \
-    yum install -y httpd \
-                   rh-ruby${RH_RUBY_VERSION} \
+    yum install -y rh-ruby${RH_RUBY_VERSION} \
                    rh-ruby${RH_RUBY_VERSION}-ruby-devel \
                    rh-ruby${RH_RUBY_VERSION}-rubygem-bundler && \
     yum clean all -y
@@ -23,20 +22,7 @@ ENV BASH_ENV="/opt/rh/rh-ruby${RH_RUBY_VERSION}/enable"
 RUN source /opt/rh/rh-ruby${RH_RUBY_VERSION}/enable; \
     gem install jekyll --version "= $JEKYLL_VERSION"
 
-# TODO (optional): Copy the builder files into /opt/app-root
-# COPY ./<builder_folder>/ /opt/app-root/
-
 COPY ./s2i/bin/ /usr/libexec/s2i
-COPY ./etc/httpd.conf /opt/app-root/etc
-RUN mkdir -p /run/httpd \
-             /opt/app-root/run \
-             /opt/app-root/log \
-             /opt/app-root/html; \
-    chmod 1777 /run/httpd \
-               /opt/app-root/run \
-               /opt/app-root/log; \
-    chown -R 1001 /run/httpd \
-                  /opt/app-root
 
 USER 1001
 EXPOSE 8080