Merge pull request #63 from frontid/5.2.3

Updated docker4drupal to 5.2.3

Author: Marcelo Tosco

docker-compose.yml

@@ -24,6 +24,7 @@ services:
       DB_PASSWORD: $DB_PASSWORD
       DB_NAME: $DB_NAME
       DB_DRIVER: $DB_DRIVER
+      COLUMNS: 80 # Set 80 columns for docker exec -it.
 ## Read instructions at https://wodby.com/stacks/drupal/docs/local/xdebug/
 #      PHP_XDEBUG: 1
 #      PHP_XDEBUG_DEFAULT_ENABLE: 1
@@ -35,20 +36,28 @@ services:
 #      PHP_XDEBUG_REMOTE_HOST: 10.0.75.1 # Windows, Docker < 18.03
     volumes:
       - ./:/var/www/html
+## For macOS users (https://wodby.com/stacks/drupal/docs/local/docker-for-mac/)
+#      - ./:/var/www/html:cached # User-guided caching
+#      - docker-sync:/var/www/html # Docker-sync
 ## For Xdebug profiler files
 #      - files:/mnt/files
 
+
   apache:
-    image: wodby/php-apache:$APACHE_TAG
+    image: wodby/apache:$APACHE_TAG
     container_name: "${PROJECT_NAME}_apache"
     depends_on:
       - php
     environment:
       APACHE_LOG_LEVEL: debug
       APACHE_BACKEND_HOST: php
-      APACHE_SERVER_ROOT: /var/www/html/web
+      APACHE_VHOST_PRESET: php
+      APACHE_DOCUMENT_ROOT: /var/www/html/web
     volumes:
       - ./:/var/www/html
+# For macOS users (https://wodby.com/stacks/drupal/docs/local/docker-for-mac/)
+#      - ./:/var/www/html:cached # User-guided caching
+#      - docker-sync:/var/www/html # Docker-sync
     labels:
       - 'traefik.backend=apache'
       - 'traefik.port=80'

example.docker.env

@@ -1,5 +1,6 @@
 # ----------------------------------------------------------------------------
 ### PROJECT SETTINGS
+
 PROJECT_NAME=dockerizer
 PROJECT_BASE_URL=dockerizer.localhost
 # If your project resides in a subdir you can specify it on PROJECT_BASE_PATH
@@ -15,23 +16,33 @@ DB_DRIVER=mysql
 # ----------------------------------------------------------------------------
 ### --- MARIADB ----
 
-MARIADB_TAG=10.1-3.2.1
-#MARIADB_TAG=10.3-3.2.1
-#MARIADB_TAG=10.2-3.2.1
+MARIADB_TAG=10.1-3.3.5
+#MARIADB_TAG=10.3-3.3.5
+#MARIADB_TAG=10.2-3.3.5
 
 # ----------------------------------------------------------------------------
 ### --- PHP ----
 
-PHP_TAG=7.2-dev-4.5.1
-#PHP_TAG=7.1-dev-4.5.1
-#PHP_TAG=7.0-dev-4.5.1
-#PHP_TAG=5.6-dev-4.5.1
-#PHP_TAG=5.3-dev-4.5.1
+# Linux (uid 1000 gid 1000)
+
+PHP_TAG=7.1-dev-4.7.5
+#PHP_TAG=7.2-dev-4.7.5
+#PHP_TAG=7.0-dev-4.7.5
+#PHP_TAG=5.6-dev-4.7.5
+#PHP_TAG=5.3-dev-4.7.5
+
+# macOS (uid 501 gid 20)
+
+#PHP_TAG=7.1-dev-macos-4.7.5
+#PHP_TAG=7.2-dev-macos-4.7.5
+#PHP_TAG=7.0-dev-macos-4.7.5
+#PHP_TAG=5.6-dev-macos-4.7.5
+#PHP_TAG=5.3-dev-macos-4.7.5
 
 # ----------------------------------------------------------------------------
 ### OTHERS
 
-APACHE_TAG=2.4-3.0.5
+APACHE_TAG=2.4-4.0.0
 
 # ----------------------------------------------------------------------------
 ### --- CUSTOM VARS ----