aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile2
-rwxr-xr-xs2i/bin/run3
2 files changed, 1 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 5b54863..921ee9f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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 $@