Develop (#60)

* Adding redis config and updating dockerfiles to add it in for development.

* Supporting memcache more correctly.

* Add in the infinispan config file by default.
Alphabetise other config file order.

* Missed the actual config file.

* Adding infinispan container and updating build to support extending the s2i container.

* Add Dockerfile into the list of default installed files.

* Can't stand it any longer, we either alphabeticise, or group by related.

* Need to export the user so that docker-compose has it. Adjust Dockerfile style.

* Add removing built image to purge command.

* Adding infinispan memcached for development.

* Remove personal bits, add some missing parts.

* Missed the memcache enable for osx.

* Adding redis prefix support, exposing infinispan management.

* Remove unsupported parameter.

* Missing exposed ports and default user/pass for infinispan.

* Fix syntax error.

* Sigh fix another syntax error.

* Moving build specific files into their own dir.

* HOTFIX: Add phpstan deprecation analysis to lint command.

* Moving xdebug into docker/ dir
* Fixing some other things that hadn't quite had that updated yet.

* Make redis and memcache prefixes consistent.

* Default to Redis - we're not committing to RDG/Infinispan yet.

Author: singularo

docker-compose.linux.yml

@@ -1,45 +1,88 @@
 version: '3'
 services:
   web:
-    image: uofa/apache2-php7-dev:foundation
-    # This makes the container run on the same network stack as your
-    # workstation. Meaning that you can interact on "localhost".
-    network_mode: host
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+      args:
+        USER_ID: ${USER_ID:-1000}
+        GROUP_ID: ${GROUP_ID:-1000}
+    image: uofa/s2i-shepherd-drupal-dev
+    # Chrome webdriver requires this - used for tests.
+    privileged: true
+    hostname: ${PROJECT}
+    ports:
+      - "80:8080"
     environment:
+      CONFIG_SYNC_DIRECTORY: /shared/private/random-hash/sync
+      DATABASE_HOST: db
+      DATABASE_USER: user
+      DATABASE_PASSWORD: password
+      HASH_SALT: random-hash
+      MEMCACHE_ENABLED: 0
+      MEMCACHE_HOST: memcached
+      PHP_IDE_CONFIG: serverName=${PROJECT}.${DOMAIN}
+      PUBLIC_DIR: /shared/public
+      REDIS_ENABLED: 1
+      REDIS_HOST: redis
+      SHEPHERD_SITE_ID: 2
+      SHEPHERD_INSTALL_PROFILE: ua
+      SHEPHERD_SECRET_PATH: /code/private
+      SHEPHERD_TOKEN: super-secret-token
+      SHEPHERD_URL: http://shepherd.test
       SITE_TITLE: WCMS D8
       SITE_MAIL: [email protected]
       SITE_ADMIN_EMAIL: [email protected]
       SITE_ADMIN_USERNAME: admin
       SITE_ADMIN_PASSWORD: password
-      PUBLIC_DIR: /shared/public
-      HASH_SALT: random-hash
-      CONFIG_SYNC_DIRECTORY: /shared/private/random-hash/sync
-      SHEPHERD_SITE_ID: 2
-      SHEPHERD_URL: http://shepherd.test
-      SHEPHERD_TOKEN: super-secret-token
-      SHEPHERD_INSTALL_PROFILE: ua
-      REDIS_ENABLED: 1
-      SHEPHERD_SECRET_PATH: /code/private
-      XDEBUG_CONFIG: "remote_host=127.0.0.1"
-      PHP_IDE_CONFIG: serverName=localhost
+      VIRTUAL_HOST: ${PROJECT}.${DOMAIN}
+      # Do not define this as '/' or apache2 will give strange behaviour, to test locally,
+      # change to the web directory and create a symlink to the subpath name eg ln -s . subpath
+      # WEB_PATH: /subpath
+      XDEBUG_CONFIG: "remote_host=172.17.0.1"
     volumes:
       - .:/code
       - ./shared:/shared
-      - $HOME/.ssh/id_rsa:/root/.ssh/id_rsa
+      - ${XDG_RUNTIME_DIR}/keyring:/ssh
+    networks:
+      - default
 
   db:
     image: mariadb
-    network_mode: host
     environment:
       MYSQL_DATABASE: drupal
       MYSQL_USER: user
       MYSQL_PASSWORD: password
       MYSQL_ROOT_PASSWORD: super-secret-password
+    networks:
+      - default
 
   mail:
     image: mailhog/mailhog
-    network_mode: host
+    environment:
+      VIRTUAL_HOST: mail.${PROJECT}.${DOMAIN}
+    networks:
+      - default
 
   redis:
     image: redis:alpine
-    network_mode: host
+    networks:
+      - default
+
+  memcached:
+    image: jboss/infinispan-server:9.4.11.Final
+    ports:
+      - "9990:9990"
+    environment:
+      APP_USER: user
+      APP_PASS: pass
+      MGMT_USER: admin
+      MGMT_PASS: admin
+    entrypoint:
+      - docker-entrypoint.sh
+      - -c
+      - standalone-memcached.xml
+    volumes:
+      - ./docker/standalone-memcached.xml:/opt/jboss/infinispan-server/standalone/configuration/standalone-memcached.xml
+    networks:
+      - default

docker-compose.osx.yml

@@ -1,31 +1,40 @@
 version: '3'
 services:
   web:
-    image: uofa/apache2-php7-dev:foundation
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+      args:
+        USER_ID: ${USER_ID:-1000}
+        GROUP_ID: ${GROUP_ID:-1000}
+    image: uofa/s2i-shepherd-drupal-dev
     # You will notice that we are forwarding port which do not belong to PHP.
     # We have to declare them here because these "sidecar" services are sharing
     # THIS containers network stack.
     ports:
-      - "80:80"
+      - "80:8080"
       - "3306:3306"
       - "8025:8025"
+      - "9990:9990"
+      - "11211:11211"
     environment:
+      CONFIG_SYNC_DIRECTORY: /shared/private/random-hash/sync
+      HASH_SALT: random-hash
+      MEMCACHE_ENABLED: 0
+      PUBLIC_DIR: /shared/public
+      REDIS_ENABLED: 1
+      SHEPHERD_INSTALL_PROFILE: ua
+      SHEPHERD_SITE_ID: 2
+      SHEPHERD_SECRET_PATH: /code/private
+      SHEPHERD_TOKEN: super-secret-token
+      SHEPHERD_URL: http://shepherd.test
       SITE_TITLE: WCMS D8
       SITE_MAIL: [email protected]
       SITE_ADMIN_EMAIL: [email protected]
       SITE_ADMIN_USERNAME: admin
       SITE_ADMIN_PASSWORD: password
-      PUBLIC_DIR: /shared/public
-      HASH_SALT: random-hash
-      CONFIG_SYNC_DIRECTORY: /shared/private/random-hash/sync
-      SHEPHERD_SITE_ID: 2
-      SHEPHERD_URL: http://shepherd.test
-      SHEPHERD_TOKEN: super-secret-token
-      SHEPHERD_INSTALL_PROFILE: ua
-      REDIS_ENABLED: 1
-      SHEPHERD_SECRET_PATH: /code/private
-      XDEBUG_CONFIG: "remote_host=docker.for.mac.localhost"
       PHP_IDE_CONFIG: serverName=localhost
+      XDEBUG_CONFIG: "remote_host=docker.for.mac.localhost"
     volumes:
       - nfsmount:/code
       - ./shared:/shared
@@ -54,6 +63,21 @@ services:
     image: redis:alpine
     network_mode: service:web
 
+  memcached:
+    image: jboss/infinispan-server:9.4.11.Final
+    environment:
+      APP_USER: user
+      APP_PASS: pass
+      MGMT_USER: admin
+      MGMT_PASS: admin
+    entrypoint:
+      - docker-entrypoint.sh
+      - -c
+      - standalone-memcached.xml
+    volumes:
+      - ./docker/standalone-memcached.xml:/opt/jboss/infinispan-server/standalone/configuration/standalone-memcached.xml
+    network_mode: service:web
+
 volumes:
   nfsmount:
     driver: local

docker/Dockerfile

@@ -0,0 +1,57 @@
+# This dockerfile takes the current users uid/gid at build time and adjusts reality
+# so that the running user for www-data is actually the same as the launching user.
+FROM uofa/s2i-shepherd-drupal
+
+ARG USER_ID
+ARG GROUP_ID
+
+# Need to switch from www-data to root to do the change of uid
+USER 0:0
+
+# Remove existing www user (both) and group (dialout is the users group on mac).
+RUN \
+if [ ${USER_ID:-0} -ne 0 ] && [ ${GROUP_ID:-0} -ne 0 ]; then \
+    userdel -f www-data \
+    && groupdel dialout \
+    && if getent group www-data ; then groupdel www-data; fi \
+    && groupadd -g ${GROUP_ID} www-data \
+    && useradd -l -u ${USER_ID} -g www-data www-data \
+    && install -d -m 0755 -o www-data -g www-data /home/www-data \
+    && chown --changes --no-dereference --recursive \
+        --from=33 ${USER_ID}:${GROUP_ID} \
+        /var/www \
+        /run/lock \
+        /var/run/apache2 \
+        /var/log/apache2 \
+        /var/lock/apache2 \
+        /code \
+        /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 \
+&& 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.
+RUN wget -q https://getcomposer.org/installer -O - | php -d allow_url_fopen=On -- --install-dir=/usr/local/bin --filename=composer
+
+COPY ./docker/xdebug.ini /etc/php/7.2/mods-available/xdebug.ini
+
+RUN echo "www-data ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/www-data
+
+# Enable xdebug.
+RUN phpenmod -v ALL -s ALL xdebug
+
+USER www-data