Patches for wodby/docker4drupal v5.x

docker-compose.yml.patch

--- docker-compose.yml	2018-03-27 16:25:27.000000000 +0200
+++ docker-compose.yml.agile	2018-03-29 08:49:57.000000000 +0200
@@ -10,6 +10,8 @@
       MYSQL_DATABASE: $DB_NAME
       MYSQL_USER: $DB_USER
       MYSQL_PASSWORD: $DB_PASSWORD
+    ports:
+      - 3306:3306
 #    volumes:
 #      - ./mariadb-init:/docker-entrypoint-initdb.d # Place init .sql file(s) here.
 #      - /path/to/mariadb/data/on/host:/var/lib/mysql # I want to manage volumes manually.
@@ -18,21 +20,22 @@
     image: wodby/drupal-php:$PHP_TAG
     container_name: "${PROJECT_NAME}_php"
     environment:
+      COLUMNS: 80
       PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailhog:1025
       DB_HOST: $DB_HOST
       DB_USER: $DB_USER
       DB_PASSWORD: $DB_PASSWORD
       DB_NAME: $DB_NAME
       DB_DRIVER: $DB_DRIVER
-#      PHP_XDEBUG: 1
-#      PHP_XDEBUG_DEFAULT_ENABLE: 1
-#      PHP_XDEBUG_REMOTE_CONNECT_BACK: 0
-#      PHP_XDEBUG_REMOTE_HOST: "10.254.254.254"
+      PHP_XDEBUG: 1
+      PHP_XDEBUG_DEFAULT_ENABLE: 1
+      PHP_XDEBUG_REMOTE_CONNECT_BACK: 0
+      PHP_XDEBUG_REMOTE_HOST: "10.254.254.254"
 #      PHP_BLACKFIRE: 1
     volumes:
-      - ./:/var/www/html
+#      - ./:/var/www/html
 ## For macOS users (https://wodby.com/stacks/drupal/docs/local/docker-for-mac/)
-#      - ./:/var/www/html:cached # User-guided caching
+      - ./gitroot:/var/www/html:cached # User-guided caching
 #      - docker-sync:/var/www/html # Docker-sync
 ## For Xdebug profiler files
 #      - files:/mnt/files
@@ -49,9 +52,9 @@
       NGINX_SERVER_ROOT: /var/www/html/web
 #      NGINX_DRUPAL_FILE_PROXY_URL: http://example.com
     volumes:
-      - ./:/var/www/html
+#      - ./:/var/www/html
 # For macOS users (https://wodby.com/stacks/drupal/docs/local/docker-for-mac/)
-#      - ./:/var/www/html:cached # User-guided caching
+      - ./gitroot:/var/www/html:cached # User-guided caching
 #      - docker-sync:/var/www/html # Docker-sync
     labels:
       - 'traefik.backend=nginx'
@@ -125,19 +128,19 @@
 #      - 'traefik.port=9000'
 #      - 'traefik.frontend.rule=Host:adminer.${PROJECT_BASE_URL}'
 
-#  pma:
-#    image: phpmyadmin/phpmyadmin
-#    container_name: "${PROJECT_NAME}_pma"
-#    environment:
-#      PMA_HOST: $DB_HOST
-#      PMA_USER: $DB_USER
-#      PMA_PASSWORD: $DB_PASSWORD
-#      PHP_UPLOAD_MAX_FILESIZE: 1G
-#      PHP_MAX_INPUT_VARS: 1G
-#    labels:
-#      - 'traefik.backend=pma'
-#      - 'traefik.port=80'
-#      - 'traefik.frontend.rule=Host:pma.${PROJECT_BASE_URL}'
+  pma:
+    image: phpmyadmin/phpmyadmin
+    container_name: "${PROJECT_NAME}_pma"
+    environment:
+      PMA_HOST: $DB_HOST
+      PMA_USER: $DB_USER
+      PMA_PASSWORD: $DB_PASSWORD
+      PHP_UPLOAD_MAX_FILESIZE: 1G
+      PHP_MAX_INPUT_VARS: 1G
+    labels:
+      - 'traefik.backend=pma'
+      - 'traefik.port=80'
+      - 'traefik.frontend.rule=Host:pma.${PROJECT_BASE_URL}'
 
 #  solr:
 #    image: wodby/drupal-solr:$SOLR_TAG
@@ -230,7 +233,7 @@
     container_name: "${PROJECT_NAME}_traefik"
     command: -c /dev/null --web --docker --logLevel=INFO
     ports:
-      - '8000:80'
+      - '80:80'
 #      - '8080:8080' # Dashboard
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock

env7.patch

--- .env	2018-03-27 16:17:22.000000000 +0200
+++ env.7	2018-03-27 16:18:12.000000000 +0200
@@ -22,7 +22,7 @@
 DB_NAME=drupal
 DB_USER=drupal
 DB_PASSWORD=drupal
-DB_ROOT_PASSWORD=password
+DB_ROOT_PASSWORD=root
 DB_HOST=mariadb
 DB_DRIVER=mysql
 
@@ -34,7 +34,7 @@
 ### --- VANILLA DRUPAL ----
 ### [DRUPAL_VERSION]-[PHP_VERSION]-[STABILITY_TAG]
 
-DRUPAL_TAG=8-7.1-4.2.2
+#DRUPAL_TAG=8-7.1-4.2.2
 #DRUPAL_TAG=8-7.0-4.2.2
 #DRUPAL_TAG=7-7.1-4.2.2
 #DRUPAL_TAG=7-7.0-4.2.2
@@ -44,8 +44,8 @@
 
 ### --- PHP ----
 
-PHP_TAG=7.1-dev-4.2.2
-#PHP_TAG=7.0-dev-4.2.2
+#PHP_TAG=7.1-dev-4.2.2
+PHP_TAG=7.0-dev-4.2.2
 #PHP_TAG=5.6-dev-4.2.2
 #PHP_TAG=5.3-dev-4.2.2
 #PHP_TAG=7.1-dev-macos-4.2.2
@@ -56,8 +56,8 @@
 ### --- NGINX ----
 ### [DRUPAL_VERSION]-[NGINX_VERSION]-[STABILITY_TAG]
 
-NGINX_TAG=8-1.13-4.0.2
-#NGINX_TAG=7-1.13-4.0.2
+#NGINX_TAG=8-1.13-4.0.2
+NGINX_TAG=7-1.13-4.0.2
 #NGINX_TAG=6-1.13-4.0.2
 #NGINX_TAG=8-1.12-4.0.2
 #NGINX_TAG=7-1.12-4.0.2

env8.patch

--- .env	2018-03-27 16:17:22.000000000 +0200
+++ env.8	2018-03-27 16:17:01.000000000 +0200
@@ -22,7 +22,7 @@
 DB_NAME=drupal
 DB_USER=drupal
 DB_PASSWORD=drupal
-DB_ROOT_PASSWORD=password
+DB_ROOT_PASSWORD=root
 DB_HOST=mariadb
 DB_DRIVER=mysql
 
@@ -34,7 +34,7 @@
 ### --- VANILLA DRUPAL ----
 ### [DRUPAL_VERSION]-[PHP_VERSION]-[STABILITY_TAG]
 
-DRUPAL_TAG=8-7.1-4.2.2
+#DRUPAL_TAG=8-7.1-4.2.2
 #DRUPAL_TAG=8-7.0-4.2.2
 #DRUPAL_TAG=7-7.1-4.2.2
 #DRUPAL_TAG=7-7.0-4.2.2
@@ -44,8 +44,8 @@
 
 ### --- PHP ----
 
-PHP_TAG=7.1-dev-4.2.2
-#PHP_TAG=7.0-dev-4.2.2
+#PHP_TAG=7.1-dev-4.2.2
+PHP_TAG=7.0-dev-4.2.2
 #PHP_TAG=5.6-dev-4.2.2
 #PHP_TAG=5.3-dev-4.2.2
 #PHP_TAG=7.1-dev-macos-4.2.2