build tweak

2 files changed, 8 insertions, 7 deletions

diff --git a/s2i/bin/assemble b/s2i/bin/assemble
index 554b195..8dd3930 100755
--- a/s2i/bin/assemble
+++ b/s2i/bin/assemble
@@ -12,11 +12,9 @@ if [[ "$1" == "-h" ]]; then
 	exec /usr/libexec/s2i/usage
 fi
 
-set -e
-
-echo "---> Enabling s2i support in httpd24 image ..."
-source ${HTTPD_CONTAINER_SCRIPTS_PATH}/common.sh
-config_s2i
+echo "--- debug ---"
+id -a
+echo "---"
 
 if [ "$(ls /tmp/artifacts/ 2>/dev/null)" ]; then
 	echo "---> Restoring build artifacts ..."
@@ -52,4 +50,4 @@ cp -av . "$dest"
 popd
 
 echo "---> Fix permissions ..."
-fix-permissions ./
+chmod -R +r .
diff --git a/s2i/bin/run b/s2i/bin/run
index e63ae48..6692e10 100755
--- a/s2i/bin/run
+++ b/s2i/bin/run
@@ -1,2 +1,5 @@
 #!/bin/sh
-exec "${0}.httpd" "$@"
+echo "--- debug ---"
+find /etc/httpd -type f | xargs egrep -i -e '(listen)'
+echo "---"
+exec httpd -D FOREGROUND