aboutsummaryrefslogtreecommitdiffstats
path: root/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile15
1 files changed, 8 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile
index 37d9b93..b2accd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,11 @@
# kraxel/s2i-jekyll
FROM centos/httpd-24-centos7
-LABEL maintainer="Gerd Hoffmann <kraxel@redhat.com>"
-
ENV RH_RUBY_VERSION="25" \
JEKYLL_VERSION="3.8.5"
-LABEL io.k8s.description="Platform for building static jekyll sites" \
+LABEL maintainer="Gerd Hoffmann <kraxel@redhat.com>" \
+ io.k8s.description="Platform for building static jekyll sites" \
io.k8s.display-name="Jekyll ${JEKYLL_VERSION}" \
io.openshift.expose-services="8080:http" \
io.openshift.tags="jekyll,static"
@@ -21,12 +20,14 @@ RUN yum install -y centos-release-scl && \
rh-ruby${RH_RUBY_VERSION}-rubygem-bundler && \
yum clean all -y
-ENV BASH_ENV="/opt/rh/rh-ruby${RH_RUBY_VERSION}/enable"
+COPY ./s2i/bin/ /usr/libexec/s2i
+COPY ./etc/httpd.d/* /etc/httpd/conf.d
+COPY ./etc/scl_enable /etc
-RUN source /opt/rh/rh-ruby${RH_RUBY_VERSION}/enable; \
- gem install jekyll --version "= $JEKYLL_VERSION"
+ENV BASH_ENV="/etc/scl_enable"
-COPY ./s2i/bin/ /usr/libexec/s2i
+RUN source /etc/enable; \
+ gem install jekyll --version "= $JEKYLL_VERSION"
USER 1001
EXPOSE 8080