diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2019-09-16 21:46:52 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-09-16 21:46:52 +0200 |
| commit | 2087dfbdc3e4c006a04fd6be02d2201803dff124 (patch) | |
| tree | 63cda2a95e6ccefe807d0d741209f7d9c9fa9343 | |
| parent | 77959867d3f0a23af9d35bfbf64394f5dbad4fad (diff) | |
| download | s2i-jekyll-2087dfbdc3e4c006a04fd6be02d2201803dff124.tar.gz | |
rename ubi7 -> rhel7, tweak install
| -rw-r--r-- | Dockerfile.rhel7 (renamed from Dockerfile.ubi7) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile.ubi7 b/Dockerfile.rhel7 index e517c14..3a39e1c 100644 --- a/Dockerfile.ubi7 +++ b/Dockerfile.rhel7 @@ -16,14 +16,14 @@ LABEL maintainer="Gerd Hoffmann <kraxel@redhat.com>" \ USER root -RUN yum --disable-plugin=subscription-manager \ - install -y make gcc gcc-c++ binutils \ +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 --disable-plugin=subscription-manager \ - clean all -y + yum clean all -y RUN for file in /usr/libexec/s2i/*; do cp -v $file ${file}.httpd; done COPY ./s2i/bin/ /usr/libexec/s2i |