diff -u b/build_local.sh b/build_local.sh
--- b/build_local.sh
+++ b/build_local.sh
@@ -10,9 +10,9 @@
 
-mapfile -t DOCKERFILES < <(ls -1 db/*/Dockerfile)
-
-for DOCKERFILE in "${DOCKERFILES[@]}"
-do
-  DOCKERTAG=$(echo ${DOCKERFILE} | awk 'BEGIN {FS="/";} {print $1"-"$2}')
-  docker build -t drupalci/${DOCKERTAG} ./${DOCKERFILE%/Dockerfile}
-done
+#mapfile -t DOCKERFILES < <(ls -1 db/*/Dockerfile)
+#
+#for DOCKERFILE in "${DOCKERFILES[@]}"
+#do
+#  DOCKERTAG=$(echo ${DOCKERFILE} | awk 'BEGIN {FS="/";} {print $1"-"$2}')
+#  docker build -t drupalci/${DOCKERTAG} ./${DOCKERFILE%/Dockerfile}
+#done
 
reverted:
--- b/php/5.5.38-apache/conf/supervisor-chrome.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:chrome]
-# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
-# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
-command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
-directory=/var/www/html
-autostart=false
-autorestart=true
-startretries=5
-stderr_logfile=/var/log/supervisor/xvfb.err.log
-stdout_logfile=/var/log/supervisor/xvfb.out.log
-user=www-data
reverted:
--- b/php/5.5.9-apache/conf/supervisor-chrome.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:chrome]
-# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
-# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
-command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
-directory=/var/www/html
-autostart=false
-autorestart=true
-startretries=5
-stderr_logfile=/var/log/supervisor/xvfb.err.log
-stdout_logfile=/var/log/supervisor/xvfb.out.log
-user=www-data
reverted:
--- b/php/5.6-apache/conf/supervisor-chrome.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:chrome]
-# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
-# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
-command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
-directory=/var/www/html
-autostart=false
-autorestart=true
-startretries=5
-stderr_logfile=/var/log/supervisor/xvfb.err.log
-stdout_logfile=/var/log/supervisor/xvfb.out.log
-user=www-data
reverted:
--- b/php/5.6.x-apache/conf/supervisor-chrome.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:chrome]
-# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
-# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
-command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
-directory=/var/www/html
-autostart=false
-autorestart=true
-startretries=5
-stderr_logfile=/var/log/supervisor/xvfb.err.log
-stdout_logfile=/var/log/supervisor/xvfb.out.log
-user=www-data
reverted:
--- b/php/7.0-apache/conf/supervisor-chrome.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:chrome]
-# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
-# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
-command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
-directory=/var/www/html
-autostart=false
-autorestart=true
-startretries=5
-stderr_logfile=/var/log/supervisor/xvfb.err.log
-stdout_logfile=/var/log/supervisor/xvfb.out.log
-user=www-data
reverted:
--- b/php/7.0.x-apache/conf/supervisor-chrome.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:chrome]
-# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
-# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
-command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
-directory=/var/www/html
-autostart=false
-autorestart=true
-startretries=5
-stderr_logfile=/var/log/supervisor/xvfb.err.log
-stdout_logfile=/var/log/supervisor/xvfb.out.log
-user=www-data
reverted:
--- b/php/7.1-apache/conf/supervisor-chrome.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:chrome]
-# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
-# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
-command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
-directory=/var/www/html
-autostart=false
-autorestart=true
-startretries=5
-stderr_logfile=/var/log/supervisor/xvfb.err.log
-stdout_logfile=/var/log/supervisor/xvfb.out.log
-user=www-data
reverted:
--- b/php/7.1.x-apache/conf/supervisor-chrome.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:chrome]
-# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
-# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
-command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
-directory=/var/www/html
-autostart=false
-autorestart=true
-startretries=5
-stderr_logfile=/var/log/supervisor/xvfb.err.log
-stdout_logfile=/var/log/supervisor/xvfb.out.log
-user=www-data
only in patch2:
unchanged:
--- /dev/null
+++ b/php/5.5.38-apache/conf/supervisor-xvfb.conf
@@ -0,0 +1,13 @@
+[program:xvfb]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+environment=DBUS_SESSION_BUS_ADDRESS=/dev/null,DISPLAY=:99
+priority=10
+directory=/
+command=/usr/bin/Xvfb :99 -screen 0 1024x768x16
+user=root
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/supervisor/xvfb.err.log
+stderr_logfile=/var/log/supervisor/xvfb.out.err
only in patch2:
unchanged:
--- /dev/null
+++ b/php/5.5.9-apache/conf/supervisor-xvfb.conf
@@ -0,0 +1,13 @@
+[program:xvfb]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+environment=DBUS_SESSION_BUS_ADDRESS=/dev/null,DISPLAY=:99
+priority=10
+directory=/
+command=/usr/bin/Xvfb :99 -screen 0 1024x768x16
+user=root
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/supervisor/xvfb.err.log
+stderr_logfile=/var/log/supervisor/xvfb.out.err
only in patch2:
unchanged:
--- /dev/null
+++ b/php/5.6-apache/conf/supervisor-xvfb.conf
@@ -0,0 +1,13 @@
+[program:xvfb]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+environment=DBUS_SESSION_BUS_ADDRESS=/dev/null,DISPLAY=:99
+priority=10
+directory=/
+command=/usr/bin/Xvfb :99 -screen 0 1024x768x16
+user=root
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/supervisor/xvfb.err.log
+stderr_logfile=/var/log/supervisor/xvfb.out.err
only in patch2:
unchanged:
--- /dev/null
+++ b/php/5.6.x-apache/conf/supervisor-xvfb.conf
@@ -0,0 +1,13 @@
+[program:xvfb]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+environment=DBUS_SESSION_BUS_ADDRESS=/dev/null,DISPLAY=:99
+priority=10
+directory=/
+command=/usr/bin/Xvfb :99 -screen 0 1024x768x16
+user=root
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/supervisor/xvfb.err.log
+stderr_logfile=/var/log/supervisor/xvfb.out.err
only in patch2:
unchanged:
--- /dev/null
+++ b/php/7.0-apache/conf/supervisor-xvfb.conf
@@ -0,0 +1,13 @@
+[program:xvfb]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+environment=DBUS_SESSION_BUS_ADDRESS=/dev/null,DISPLAY=:99
+priority=10
+directory=/
+command=/usr/bin/Xvfb :99 -screen 0 1024x768x16
+user=root
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/supervisor/xvfb.err.log
+stderr_logfile=/var/log/supervisor/xvfb.out.err
only in patch2:
unchanged:
--- /dev/null
+++ b/php/7.0.x-apache/conf/supervisor-xvfb.conf
@@ -0,0 +1,13 @@
+[program:xvfb]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+environment=DBUS_SESSION_BUS_ADDRESS=/dev/null,DISPLAY=:99
+priority=10
+directory=/
+command=/usr/bin/Xvfb :99 -screen 0 1024x768x16
+user=root
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/supervisor/xvfb.err.log
+stderr_logfile=/var/log/supervisor/xvfb.out.err
only in patch2:
unchanged:
--- /dev/null
+++ b/php/7.1-apache/conf/supervisor-xvfb.conf
@@ -0,0 +1,13 @@
+[program:xvfb]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+environment=DBUS_SESSION_BUS_ADDRESS=/dev/null,DISPLAY=:99
+priority=10
+directory=/
+command=/usr/bin/Xvfb :99 -screen 0 1024x768x16
+user=root
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/supervisor/xvfb.err.log
+stderr_logfile=/var/log/supervisor/xvfb.out.err
only in patch2:
unchanged:
--- /dev/null
+++ b/php/7.1.x-apache/conf/supervisor-xvfb.conf
@@ -0,0 +1,13 @@
+[program:xvfb]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+environment=DBUS_SESSION_BUS_ADDRESS=/dev/null,DISPLAY=:99
+priority=10
+directory=/
+command=/usr/bin/Xvfb :99 -screen 0 1024x768x16
+user=root
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/supervisor/xvfb.err.log
+stderr_logfile=/var/log/supervisor/xvfb.out.err