From 44ba80823d8dda14a116d198a367e0fae9649e77 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 10 Sep 2019 11:21:07 +0200 Subject: scl quirks --- Dockerfile | 15 ++++++++------- etc/scl_enable | 2 ++ 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 etc/scl_enable 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 " - ENV RH_RUBY_VERSION="25" \ JEKYLL_VERSION="3.8.5" -LABEL io.k8s.description="Platform for building static jekyll sites" \ +LABEL maintainer="Gerd Hoffmann " \ + 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 diff --git a/etc/scl_enable b/etc/scl_enable new file mode 100644 index 0000000..dd81bd9 --- /dev/null +++ b/etc/scl_enable @@ -0,0 +1,2 @@ +source scl_enable httpd24 +source scl_enable rh-ruby${RH_RUBY_VERSION} -- cgit