diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-02-03 08:46:32 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-02-03 08:46:32 +0100 |
| commit | 015c202bd04e077bf8e87ea283e29181172cf9a5 (patch) | |
| tree | 87701254963d5df08434a21129b2f699cbbaa6b2 | |
| parent | 6059294c88ea755e07bdd55cedcc85b25ac58091 (diff) | |
| download | s2i-jekyll-015c202bd04e077bf8e87ea283e29181172cf9a5.tar.gz | |
drop rhel7, tweak ubi8
| l--------- | Dockerfile | 1 | ||||
| -rw-r--r-- | Dockerfile.rhel7 | 41 | ||||
| -rw-r--r-- | Dockerfile.ubi8 | 3 |
3 files changed, 2 insertions, 43 deletions
diff --git a/Dockerfile b/Dockerfile new file mode 120000 index 0000000..15767d9 --- /dev/null +++ b/Dockerfile @@ -0,0 +1 @@ +Dockerfile.ubi8
\ No newline at end of file diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 deleted file mode 100644 index 77f3e54..0000000 --- a/Dockerfile.rhel7 +++ /dev/null @@ -1,41 +0,0 @@ -# kraxel/s2i-jekyll -FROM registry.access.redhat.com/rhscl/httpd-24-rhel7 - -ENV RH_RUBY_VERSION="25" \ - JEKYLL_VERSION="3.8.5" \ - SUMMARY="Jekyll ${JEKYLL_VERSION}" \ - DESCRIPTION="Platform for building static jekyll sites (ubi7)" - -LABEL maintainer="Gerd Hoffmann <kraxel@redhat.com>" \ - summary="${SUMMARY}" \ - description="${DESCRIPTION}" \ - io.k8s.display-name="${SUMMARY}" \ - io.k8s.description="${DESCRIPTION}" \ - io.openshift.expose-services="8080:http" \ - io.openshift.tags="jekyll,static" - -USER root - -RUN yum install -y yum-utils && \ - prepare-yum-repositories rhel-server-rhscl-7-rpms && \ - 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.ubi8 b/Dockerfile.ubi8 index be07d3a..abb7f2a 100644 --- a/Dockerfile.ubi8 +++ b/Dockerfile.ubi8 @@ -1,8 +1,7 @@ # kraxel/s2i-jekyll FROM registry.access.redhat.com/ubi8/ruby-25 -ENV RH_RUBY_VERSION="25" \ - JEKYLL_VERSION="3.8.5" \ +ENV JEKYLL_VERSION="3.8.5" \ SUMMARY="Jekyll ${JEKYLL_VERSION}" \ DESCRIPTION="Platform for building static jekyll sites (ubi8)" |