diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2019-09-10 18:01:05 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-09-10 18:01:05 +0200 |
| commit | 1c9986d85b57df7c58d71201a242ea424592d58b (patch) | |
| tree | 070eca4955971c1670371fb75ff3a4c38bc1a4e6 | |
| parent | c5943ea8843def8b1c921d79f0eb3f1b443d1b12 (diff) | |
| download | s2i-jekyll-1c9986d85b57df7c58d71201a242ea424592d58b.tar.gz | |
copy all httpd s2i scripts
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rwxr-xr-x | s2i/bin/run | 3 |
2 files changed, 1 insertions, 4 deletions
@@ -20,7 +20,7 @@ RUN yum install -y centos-release-scl && \ rh-ruby${RH_RUBY_VERSION}-rubygem-bundler && \ yum clean all -y -RUN cp /usr/libexec/s2i/run /usr/libexec/s2i/run.httpd +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/ diff --git a/s2i/bin/run b/s2i/bin/run index 79747ce..e63ae48 100755 --- a/s2i/bin/run +++ b/s2i/bin/run @@ -1,5 +1,2 @@ #!/bin/sh exec "${0}.httpd" "$@" -#source ${HTTPD_CONTAINER_SCRIPTS_PATH}/common.sh -#export HTTPD_RUN_BY_S2I=1 -#sh -x /usr/bin/run-httpd $@ |