Release 2.4.0

wodby · Oct 17, 2017 · 95404cb · 95404cb
1 parent e5a1856
commit 95404cb
Show file tree

Hide file tree

Showing 40 changed files with 244 additions and 268 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-language: python
+language: bash
 
 sudo: required
 
@@ -9,22 +9,19 @@ env:
   global:
     - DOCKER_COMPOSE_VERSION=1.10.0
   matrix:
-    - DRUPAL=6 PHP=5.3
-    - DRUPAL=6 PHP=5.6
-    - DRUPAL=7 PHP=5.6
-    - DRUPAL=7 PHP=7.0
-    - DRUPAL=7 PHP=7.1
-    - DRUPAL=8 PHP=7.0
-    - DRUPAL=8 PHP=7.1
+    - DRUPAL_VER=6 PHP_VER=5.3
+    - DRUPAL_VER=6 PHP_VER=5.6
+    - DRUPAL_VER=7 PHP_VER=5.6
+    - DRUPAL_VER=7 PHP_VER=7.0
+    - DRUPAL_VER=7 PHP_VER=7.1
+    - DRUPAL_VER=8 PHP_VER=7.0
+    - DRUPAL_VER=8 PHP_VER=7.1
 
 install:
   - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - curl -L "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
 
 script:
-  - make test drupal=$DRUPAL php=$PHP
-
-after_failure:
-  - make logs
+  - make test
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Makefile b/Makefile
@@ -2,10 +2,10 @@
 
 .PHONY: test
 
-drupal ?= 8
-php ?= 7.1
+DRUPAL_VER ?= 8
+PHP_VER ?= 7.1
 
 default: test
 
 test:
-	cd ./test/$(drupal)/$(php) && ./run.sh
+	cd ./test/$(DRUPAL_VER)/$(PHP_VER) && ./run.sh
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Read [**Getting Started**](https://docker4drupal.readthedocs.io).
 ## Stack
 
 [wodby/drupal-nginx]: https://github.com/wodby/drupal-nginx
-[wodby/drupal-apache]: https://github.com/wodby/drupal-apache
+[wodby/php-apache]: https://github.com/wodby/php-apache
 [wodby/drupal]: https://github.com/wodby/drupal
 [wodby/drupal-php]: https://github.com/wodby/drupal-php
 [wodby/mariadb]: https://github.com/wodby/mariadb
@@ -23,39 +23,43 @@ Read [**Getting Started**](https://docker4drupal.readthedocs.io).
 [wodby/drupal-solr]: https://github.com/wodby/drupal-solr
 [wodby/drupal-node]: https://github.com/wodby/drupal-node
 [wodby/memcached]: https://github.com/wodby/memcached
+[wodby/webgrind]: https://hub.docker.com/r/wodby/webgrind
+[blackfire/blackfire]: https://hub.docker.com/r/blackfire/blackfire
 [wodby/rsyslog]: https://hub.docker.com/r/wodby/rsyslog
-[athenapdf-service]: https://hub.docker.com/r/arachnysdocker/athenapdf-service
-[mailhog]: https://hub.docker.com/r/mailhog/mailhog
+[arachnysdocker/athenapdf-service]: https://hub.docker.com/r/arachnysdocker/athenapdf-service
+[mailhog/mailhog]: https://hub.docker.com/r/mailhog/mailhog
 [wodby/adminer]: https://hub.docker.com/r/wodby/adminer
-[phpmyadmin]: https://hub.docker.com/r/phpmyadmin/phpmyadmin
-[portainer]: https://hub.docker.com/portainer/portainer
+[phpmyadmin/phpmyadmin]: https://hub.docker.com/r/phpmyadmin/phpmyadmin
+[portainer/portainer]: https://hub.docker.com/portainer/portainer
 [_/node]: https://hub.docker.com/_/node
 [_/traefik]: https://hub.docker.com/_/traefik
 
 The Drupal stack consist of the following containers:
 
-| Container | Versions | Service name | Image | Enabled by default |
-| --------- | -------- | ------------ | ----- | ------------------ |
-| Nginx               | 1.13, 1.12         | nginx     | [wodby/drupal-nginx]   | ✓ |
-| Apache              | 2.4                | apache    | [wodby/drupal-apache]  |   |
-| Drupal              | 8, 7, 6            | php       | [wodby/drupal]         | ✓ |
-| PHP                 | 7.1, 7.0, 5.6, 5.3 | php       | [wodby/drupal-php]     |   |
-| MariaDB             | 10.1               | mariadb   | [wodby/mariadb]        | ✓ |
-| Redis               | 3.2                | redis     | [wodby/redis]          |   |
-| Varnish             | 4.1                | varnish   | [wodby/drupal-varnish] |   |
-| Solr                | 6.6-6.3, 5.5, 5.4  | solr      | [wodby/drupal-solr]    |   |
-| Node.js             | 1.0                | nodejs    | [wodby/drupal-node]    |   |
-| Memcached           | 1.4                | memcached | [wodby/memcached]      |   |
-| Rsyslog             | latest             | rsyslog   | [wodby/rsyslog]        |   |
-| AthenaPDF           | latest             | athenapdf | [athenapdf-service]    |   |
-| Mailhog             | latest             | mailhog   | [mailhog]              | ✓ |
-| Adminer             | 4.3                | adminer   | [wodby/adminer]        |   |
-| phpMyAdmin          | latest             | pma       | [phpmyadmin]           |   |
-| Node                | latest             | node      | [_/node]               |   |
-| Portainer           | latest             | portainer | [portainer]            | ✓ |
-| Traefik             | latest             | traefik   | [_/traefik]            | ✓ |
+| Container  | Versions           | Service name | Image                              | Enabled by default |
+| ---------- | ------------------ | ------------ | ---------------------------------- | ------------------ |
+| Nginx      | 1.13, 1.12         | nginx        | [wodby/drupal-nginx]               | ✓                  |
+| Apache     | 2.4                | apache       | [wodby/php-apache]                 |                    |
+| Drupal     | 8, 7, 6            | php          | [wodby/drupal]                     | ✓                  |
+| PHP        | 7.1, 7.0, 5.6, 5.3 | php          | [wodby/drupal-php]                 |                    |
+| MariaDB    | 10.1               | mariadb      | [wodby/mariadb]                    | ✓                  |
+| Redis      | 3.2, 4.0           | redis        | [wodby/redis]                      |                    |
+| Varnish    | 4.1                | varnish      | [wodby/drupal-varnish]             |                    |
+| Solr       | 6.6-6.3, 5.5, 5.4  | solr         | [wodby/drupal-solr]                |                    |
+| Node.js    | 1.0                | nodejs       | [wodby/drupal-node]                |                    |
+| Memcached  | 1.4                | memcached    | [wodby/memcached]                  |                    |
+| Webgrind   | 1.5                | webgrind     | [wodby/webgrind]                   |                    |
+| Blackfire  | latest             | blackfire    | [blackfire/blackfire]              |                    |
+| Rsyslog    | latest             | rsyslog      | [wodby/rsyslog]                    |                    |
+| AthenaPDF  | 2.10.0             | athenapdf    | [arachnysdocker/athenapdf-service] |                    |
+| Mailhog    | latest             | mailhog      | [mailhog/mailhog]                  | ✓                  |
+| Adminer    | 4.3                | adminer      | [wodby/adminer]                    |                    |
+| phpMyAdmin | latest             | pma          | [phpmyadmin/phpmyadmin]            |                    |
+| Node       | latest             | node         | [_/node]                           |                    |
+| Portainer  | latest             | portainer    | [portainer/portainer]              | ✓                  |
+| Traefik    | latest             | traefik      | [_/traefik]                        | ✓                  |
 
-Supported Drupal versions: 6, 7, 8.
+Supported Drupal versions: 8 / 7 / 6
 
 ## Documentation
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2"
 
 services:
   mariadb:
-    image: wodby/mariadb:10.1-2.3.3
+    image: wodby/mariadb:10.1-2.3.5
     environment:
       MYSQL_ROOT_PASSWORD: password
       MYSQL_DATABASE: drupal
@@ -14,43 +14,48 @@ services:
 
   php:
 # 1. Images with vanilla Drupal – wodby/drupal:[DRUPAL_VERSION]-[PHP_VERSION]-[STABILITY_TAG].
-    image: wodby/drupal:8-7.1-2.4.4
-#    image: wodby/drupal:8-7.0-2.4.4
-#    image: wodby/drupal:7-7.1-2.4.4
-#    image: wodby/drupal:7-7.0-2.4.4
-#    image: wodby/drupal:7-5.6-2.4.4
-#    image: wodby/drupal:6-5.6-2.4.4
-#    image: wodby/drupal:6-5.3-2.4.4
+    image: wodby/drupal:8-7.1-3.0.0
+#    image: wodby/drupal:8-7.0-3.0.0
+#    image: wodby/drupal:7-7.1-3.0.0
+#    image: wodby/drupal:7-7.0-3.0.0
+#    image: wodby/drupal:7-5.6-3.0.0
+#    image: wodby/drupal:6-5.6-3.0.0
+#    image: wodby/drupal:6-5.3-3.0.0
 # 2. Images without Drupal – wodby/drupal-php:[PHP_VERSION]-[STABILITY_TAG].
-#    image: wodby/drupal-php:7.1-2.4.3
-#    image: wodby/drupal-php:7.0-2.4.3
-#    image: wodby/drupal-php:5.6-2.4.3
-#    image: wodby/drupal-php:5.3-2.4.3
+#    image: wodby/drupal-php:7.1-3.0.0
+#    image: wodby/drupal-php:7.0-3.0.0
+#    image: wodby/drupal-php:5.6-3.0.0
+#    image: wodby/drupal-php:5.3-3.0.0
     environment:
       PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailhog:1025
+      PHP_FPM_CLEAR_ENV: "no"
       DB_HOST: mariadb
       DB_USER: drupal
       DB_PASSWORD: drupal
       DB_NAME: drupal
       DB_DRIVER: mysql
-      # PHP_XDEBUG: 1
-      # PHP_XDEBUG_DEFAULT_ENABLE: 1
-      # PHP_XDEBUG_REMOTE_CONNECT_BACK: 0         # This is needed to respect remote.host setting below
-      # PHP_XDEBUG_REMOTE_HOST: "10.254.254.254"  # You will also need to 'sudo ifconfig lo0 alias 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_XDEBUG_PROFILER_OUTPUT_DIR: /mnt/files/xdebug/profiler
+#      PHP_XDEBUG_TRACE_OUTPUT_DIR: /mnt/files/xdebug/traces
     volumes:
       - codebase:/var/www/html
-# Options for macOS users (https://docker4drupal.readthedocs.io/en/latest/macos)
+## Options for macOS users (https://docker4drupal.readthedocs.io/en/latest/macos)
 #      - codebase:/var/www/html:cached # User-guided caching
 #      - docker-sync:/var/www/html # Docker-sync
+## For Xdebug profiler files
+#      - files:/mnt/files
 
   nginx:
 # wodby/drupal-nginx:[DRUPAL_VERSION]-[NGINX_VERSION]-[STABILITY_TAG].
-    image: wodby/drupal-nginx:8-1.13-2.4.2
-#    image: wodby/drupal-nginx:7-1.13-2.4.2
-#    image: wodby/drupal-nginx:6-1.13-2.4.2
-#    image: wodby/drupal-nginx:8-1.12-2.4.2
-#    image: wodby/drupal-nginx:7-1.12-2.4.2
-#    image: wodby/drupal-nginx:6-1.12-2.4.2
+    image: wodby/drupal-nginx:8-1.13-3.0.1
+#    image: wodby/drupal-nginx:7-1.13-3.0.1
+#    image: wodby/drupal-nginx:6-1.13-3.0.1
+#    image: wodby/drupal-nginx:8-1.12-3.0.1
+#    image: wodby/drupal-nginx:7-1.12-3.0.1
+#    image: wodby/drupal-nginx:6-1.12-3.0.1
     depends_on:
       - php
     environment:
@@ -69,7 +74,7 @@ services:
       - 'traefik.frontend.rule=Host:drupal.docker.localhost'
 
 #  apache:
-#    image: wodby/drupal-apache:2.4-1.0.2
+#    image: wodby/php-apache:2.4-2.0.0
 #    depends_on:
 #      - php
 #    environment:
@@ -87,7 +92,7 @@ services:
 #      - 'traefik.frontend.rule=Host:drupal.docker.localhost'
 
 #  varnish:
-#    image: wodby/drupal-varnish:4.1-2.1.2
+#    image: wodby/drupal-varnish:4.1-2.2.0
 #    depends_on:
 #      - nginx
 #    environment:
@@ -100,7 +105,8 @@ services:
 #      - 'traefik.frontend.rule=Host:varnish.drupal.docker.localhost'
 
 #  redis:
-#    image: wodby/redis:3.2-2.1.2
+#    image: wodby/redis:3.2-2.1.3
+##    image: wodby/redis:4.0-2.1.3
 
 #  adminer:
 #    image: wodby/adminer:4.3-1.1.0
@@ -178,7 +184,7 @@ services:
 #    image: wodby/rsyslog
 
 #  athenapdf:
-#    image: arachnysdocker/athenapdf-service
+#    image: arachnysdocker/athenapdf-service:2.10.0
 #    environment:
 #      WEAVER_AUTH_KEY: weaver-auth-key
 #      WEAVER_ATHENA_CMD: "athenapdf -S"
@@ -187,6 +193,23 @@ services:
 #      WEAVER_WORKER_TIMEOUT: 90
 #      WEAVER_CONVERSION_FALLBACK: false
 
+#  blackfire:
+#    image: blackfire/blackfire
+#    environment:
+#      BLACKFIRE_SERVER_ID: XXXXX
+#      BLACKFIRE_SERVER_TOKEN: YYYYY
+
+#  webgrind:
+#    image: wodby/webgrind:1.5-1.0.0
+#    environment:
+#      WEBGRIND_PROFILER_DIR: /mnt/files/xdebug/profiler
+#    labels:
+#      - 'traefik.backend=webgrind'
+#      - 'traefik.port=8080'
+#      - 'traefik.frontend.rule=Host:webgrind.drupal.docker.localhost'
+#    volumes:
+#      - files:/mnt/files
+
   portainer:
     image: portainer/portainer
     command: --no-auth -H unix:///var/run/docker.sock
@@ -211,3 +234,5 @@ volumes:
 ## Docker-sync for macOS users
 #  docker-sync:
 #    external: true
+## For Xdebug profiler
+#  files:
diff --git a/docs/access.md b/docs/access.md
@@ -7,5 +7,5 @@ $ docker-compose exec [service] sh
 
 Make sure you're using correct users to access the container, e.g. use user www-data (82) for Nginx and PHP containers:
 ```bash
-$ docker-compose exec --user=82 php sh
+$ docker-compose exec php sh
 ```