Support an httpd 2.4 based runtime image

Author: jwforres

.s2i/bin/assemble

@@ -1,10 +1,35 @@
 #!/bin/bash
-/usr/libexec/s2i/assemble
-rc=$?
+# Based on https://github.com/sclorg/httpd-container/blob/master/2.4/s2i/bin/assemble
 
-if [ $rc -eq 0 ]; then
-  bower install
-  rc=$?
+set -e
+
+echo "---> Enabling s2i support in httpd24 image"
+
+sed -i -f /opt/app-root/httpdconf.sed /opt/rh/httpd24/root/etc/httpd/conf/httpd.conf && \
+sed -i -f /opt/app-root/sslconf.sed /opt/rh/httpd24/root/etc/httpd/conf.d/ssl.conf && \
+echo 'IncludeOptional /opt/app-root/etc/httpd.d/*.conf' >> /opt/rh/httpd24/root/etc/httpd/conf/httpd.conf && \
+head -n151 /opt/rh/httpd24/root/etc/httpd/conf/httpd.conf | tail -n1 | grep "AllowOverride All" || exit
+sed -ri ' s!^(\s*CustomLog)\s+\S+!\1 |/usr/bin/cat!g; s!^(\s*ErrorLog)\s+\S+!\1 |/usr/bin/cat!g;' /opt/rh/httpd24/root/etc/httpd/conf/httpd.conf
+sed -ri ' s!^(\s*CustomLog)\s+\S+!\1 |/usr/bin/cat!g; s!^(\s*TransferLog)\s+\S+!\1 |/usr/bin/cat!g; s!^(\s*ErrorLog)\s+\S+!\1 |/usr/bin/cat!g;' /opt/rh/httpd24/root/etc/httpd/conf.d/ssl.conf
+
+echo "---> Installing application source"
+cp -Rf /tmp/src/dist/. ./
+cp -Rf /tmp/src/dist.java/. ./
+
+ if [ -d /tmp/src/httpd-cfg ]; then
+  echo "---> Copying httpd configuration files..."
+  if [ "$(ls -A /tmp/src/httpd-cfg/*.conf)" ]; then
+    cp -v /tmp/src/httpd-cfg/*.conf "${HTTPD_CONFIGURATION_PATH}"
+  fi
+fi
+
+if [ -d /tmp/src/tls ]; then
+  echo "---> Copying tls files..."
+  if [ "$(ls -A /tmp/src/tls/*.*)" ]; then
+    mkdir -p "${HTTPD_CONFIGURATION_PATH}/tls"
+    cp -v /tmp/src/tls/*.* "${HTTPD_CONFIGURATION_PATH}/tls"
+  fi
 fi
 
-exit $rc
+# Fix source directory permissions
+fix-permissions ./

.s2i/bin/run

@@ -1,11 +1,10 @@
 #!/bin/bash
 
-if [ -f /origin-web-console-config/config.js ]; then
-   cp -f /origin-web-console-config/config.js app/config.js
+if [ -f /openshift-web-console-config/config.js ]; then
+   cp -f /openshift-web-console-config/config.js config.js
 else
-   echo "No config.js is mounted, using default development config."
+   echo "No config.js is mounted, the console can not run without a configuration defined."
+   exit -1
 fi
 
-CONSOLE_CONTEXT_ROOT="${CONSOLE_CONTEXT_ROOT:-"dev-console"}"
-
-grunt serve --hostname=0.0.0.0 --contextRoot=${CONSOLE_CONTEXT_ROOT} --disable-live-reload
+exec /usr/libexec/s2i/run

httpd-cfg/openshift-web-console.conf

@@ -0,0 +1,36 @@
+# SSL configuration
+Listen 0.0.0.0:8443
+<VirtualHost *:8443>
+    SSLEngine on
+    SSLCertificateFile "${HTTPD_CONFIGURATION_PATH}/tls/tls.crt"
+    SSLCertificateKeyFile "${HTTPD_CONFIGURATION_PATH}/tls/tls.key"
+
+    RewriteEngine on
+    # First strip the context root
+    RewriteRule ^${OSC_CONTEXT_ROOT}(.*) /$1
+    RewriteRule ^/java$ ${OSC_ASSET_PUBLIC_URL}java/ [R,L]
+    RewriteCond %{DOCUMENT_ROOT}/java/$1 !-f
+    RewriteRule ^/java/(.*)$ /java/index.html [L,PT]
+    RewriteCond %{DOCUMENT_ROOT}/$1 !-f
+    RewriteRule (.*) /index.html [L,PT]
+</VirtualHost>
+<VirtualHost *:8080>
+    # TODO check the context root and paths are correctly maintained
+    Redirect permanent "/" "${OSC_ASSET_PUBLIC_URL}"
+</VirtualHost>
+
+FileETag MTime Size
+# Have to strip the gzip off the incoming ETag for cache control to work correctly
+# https://bz.apache.org/bugzilla/show_bug.cgi?id=45023
+RequestHeader edit "If-None-Match" "^\"(.*)-gzip\"$" "\"$1\""
+Header set Cache-Control "public, max-age=0, must-revalidate"
+SetOutputFilter DEFLATE
+
+<Location "/index.html">
+    AddOutputFilterByType SUBSTITUTE text/html
+    Substitute "s|<base href=\"/\">|<base href=\"${OSC_CONTEXT_ROOT}\">|i"
+</Location>
+<Location "/java/index.html">
+    AddOutputFilterByType SUBSTITUTE text/html
+    Substitute "s|<base href=\"/\">|<base href=\"${OSC_CONTEXT_ROOT}java/\">|i"
+</Location>

images/origin-web-console-builder/Dockerfile

@@ -0,0 +1,4 @@
+# Adds some additional dependencies to the nodejs S2I builder so that the console integration tests
+# can be run against any openshift console (server must have auth set to AllowAllPasswordIdentityProvider)
+FROM centos/httpd-24-centos7
+USER 1001