diff options
| -rwxr-xr-x | s2i/bin/assemble | 2 | ||||
| -rwxr-xr-x | s2i/bin/run | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/s2i/bin/assemble b/s2i/bin/assemble index 7699e04..554b195 100755 --- a/s2i/bin/assemble +++ b/s2i/bin/assemble @@ -49,9 +49,7 @@ echo "---> Copying pages to $dest ..." pushd _site mkdir -p "$dest" cp -av . "$dest" -ls -la /opt/app-root/src/documentroot popd echo "---> Fix permissions ..." fix-permissions ./ -ls -la /opt/app-root/src/documentroot diff --git a/s2i/bin/run b/s2i/bin/run index 477074f..79747ce 100755 --- a/s2i/bin/run +++ b/s2i/bin/run @@ -1,10 +1,5 @@ #!/bin/sh -set -x -id -a -pwd -ls -la documentroot -ls -la /etc/httpd -#sh -x "${0}.httpd" "$@" -source ${HTTPD_CONTAINER_SCRIPTS_PATH}/common.sh -export HTTPD_RUN_BY_S2I=1 -sh -x /usr/bin/run-httpd $@ +exec "${0}.httpd" "$@" +#source ${HTTPD_CONTAINER_SCRIPTS_PATH}/common.sh +#export HTTPD_RUN_BY_S2I=1 +#sh -x /usr/bin/run-httpd $@ |