From cf9171e61601ec196f63256655995179739dbe1d Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Sun, 15 Sep 2019 22:35:34 +0200 Subject: rename dockerfile --- Dockerfile | 36 ------------------------------------ Dockerfile.centos7 | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 Dockerfile create mode 100644 Dockerfile.centos7 diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 921ee9f..0000000 --- a/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# kraxel/s2i-jekyll -FROM centos/httpd-24-centos7 - -ENV RH_RUBY_VERSION="25" \ - JEKYLL_VERSION="3.8.5" - -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" - -USER root - -RUN yum install -y centos-release-scl && \ - 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.centos7 b/Dockerfile.centos7 new file mode 100644 index 0000000..921ee9f --- /dev/null +++ b/Dockerfile.centos7 @@ -0,0 +1,36 @@ +# kraxel/s2i-jekyll +FROM centos/httpd-24-centos7 + +ENV RH_RUBY_VERSION="25" \ + JEKYLL_VERSION="3.8.5" + +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" + +USER root + +RUN yum install -y centos-release-scl && \ + 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"] -- cgit