Merge branch 'develop'

Author: pingers

docker-compose.linux.yml

@@ -86,3 +86,9 @@ services:
       - ./docker/standalone-memcached.xml:/opt/jboss/infinispan-server/standalone/configuration/standalone-memcached.xml
     networks:
       - default
+
+  selenium:
+    image: selenium/standalone-chrome:3.141.59-oxygen
+    network_mode: host
+    volumes:
+      - /dev/shm:/dev/shm

docker-compose.osx.yml

@@ -78,6 +78,12 @@ services:
       - ./docker/standalone-memcached.xml:/opt/jboss/infinispan-server/standalone/configuration/standalone-memcached.xml
     network_mode: service:web
 
+  selenium:
+    image: selenium/standalone-chrome:3.141.59-oxygen
+    network_mode: service:web
+    volumes:
+      - /dev/shm:/dev/shm
+
 volumes:
   nfsmount:
     driver: local

docker/Dockerfile

@@ -28,20 +28,11 @@ if [ ${USER_ID:-0} -ne 0 ] && [ ${GROUP_ID:-0} -ne 0 ]; then \
         /shared; \
 fi
 
-# Add the chromedriver repo using php, no wget or curl yet.
-RUN php -n -r 'echo file_get_contents("https://dl-ssl.google.com/linux/linux_signing_key.pub");' | apt-key add - \
-&& echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/google-chrome.list
-
 # Upgrade all currently installed packages and install additional packages.
 RUN apt-get update \
-&& apt-get -y install php-sqlite3 php-xdebug php7.2-cli git wget sudo unzip libnotify-bin google-chrome-stable vim \
+&& apt-get -y install php-sqlite3 php-xdebug php7.2-cli git wget sudo unzip libnotify-bin vim \
 && sed -ri 's/^zend.assertions\s*=\s*-1/zend.assertions = 1/g' /etc/php/7.2/cli/php.ini \
 && sed -i 's/^\(allow_url_fopen\s*=\s*\).*$/\1on/g' /etc/php/7.2/mods-available/php_custom.ini \
-&& CHROME_DRIVER_VERSION=$(php -n -r 'echo file_get_contents("https://chromedriver.storage.googleapis.com/LATEST_RELEASE");') \
-&& wget https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
-&& unzip -o chromedriver_linux64.zip -d /usr/local/bin \
-&& rm -f chromedriver_linux64.zip \
-&& chmod +x /usr/local/bin/chromedriver \
 && apt-get -y autoremove && apt-get -y autoclean && apt-get clean && rm -rf /var/lib/apt/lists /tmp/* /var/tmp/*
 
 # Install Composer.