Skip to content

Commit 95404cb

Browse files
csandanovcsandanov
committed
Release 2.4.0
1 parent e5a1856 commit 95404cb

40 files changed

+244
-268
lines changed

‎.travis.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
language: python
1+
language: bash
22

33
sudo: required
44

@@ -9,22 +9,19 @@ env:
99
global:
1010
- DOCKER_COMPOSE_VERSION=1.10.0
1111
matrix:
12-
- DRUPAL=6 PHP=5.3
13-
- DRUPAL=6 PHP=5.6
14-
- DRUPAL=7 PHP=5.6
15-
- DRUPAL=7 PHP=7.0
16-
- DRUPAL=7 PHP=7.1
17-
- DRUPAL=8 PHP=7.0
18-
- DRUPAL=8 PHP=7.1
12+
- DRUPAL_VER=6 PHP_VER=5.3
13+
- DRUPAL_VER=6 PHP_VER=5.6
14+
- DRUPAL_VER=7 PHP_VER=5.6
15+
- DRUPAL_VER=7 PHP_VER=7.0
16+
- DRUPAL_VER=7 PHP_VER=7.1
17+
- DRUPAL_VER=8 PHP_VER=7.0
18+
- DRUPAL_VER=8 PHP_VER=7.1
1919

2020
install:
2121
- sudo rm /usr/local/bin/docker-compose
22-
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
22+
- curl -L "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" > docker-compose
2323
- chmod +x docker-compose
2424
- sudo mv docker-compose /usr/local/bin
2525

2626
script:
27-
- make test drupal=$DRUPAL php=$PHP
28-
29-
after_failure:
30-
- make logs
27+
- make test

‎CHANGELOG.md

Lines changed: 0 additions & 111 deletions
This file was deleted.

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
.PHONY: test
44

5-
drupal ?= 8
6-
php ?= 7.1
5+
DRUPAL_VER ?= 8
6+
PHP_VER ?= 7.1
77

88
default: test
99

1010
test:
11-
cd ./test/$(drupal)/$(php) && ./run.sh
11+
cd ./test/$(DRUPAL_VER)/$(PHP_VER) && ./run.sh

‎README.md

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Read [**Getting Started**](https://docker4drupal.readthedocs.io).
1414
## Stack
1515

1616
[wodby/drupal-nginx]: https://github.com/wodby/drupal-nginx
17-
[wodby/drupal-apache]: https://github.com/wodby/drupal-apache
17+
[wodby/php-apache]: https://github.com/wodby/php-apache
1818
[wodby/drupal]: https://github.com/wodby/drupal
1919
[wodby/drupal-php]: https://github.com/wodby/drupal-php
2020
[wodby/mariadb]: https://github.com/wodby/mariadb
@@ -23,39 +23,43 @@ Read [**Getting Started**](https://docker4drupal.readthedocs.io).
2323
[wodby/drupal-solr]: https://github.com/wodby/drupal-solr
2424
[wodby/drupal-node]: https://github.com/wodby/drupal-node
2525
[wodby/memcached]: https://github.com/wodby/memcached
26+
[wodby/webgrind]: https://hub.docker.com/r/wodby/webgrind
27+
[blackfire/blackfire]: https://hub.docker.com/r/blackfire/blackfire
2628
[wodby/rsyslog]: https://hub.docker.com/r/wodby/rsyslog
27-
[athenapdf-service]: https://hub.docker.com/r/arachnysdocker/athenapdf-service
28-
[mailhog]: https://hub.docker.com/r/mailhog/mailhog
29+
[arachnysdocker/athenapdf-service]: https://hub.docker.com/r/arachnysdocker/athenapdf-service
30+
[mailhog/mailhog]: https://hub.docker.com/r/mailhog/mailhog
2931
[wodby/adminer]: https://hub.docker.com/r/wodby/adminer
30-
[phpmyadmin]: https://hub.docker.com/r/phpmyadmin/phpmyadmin
31-
[portainer]: https://hub.docker.com/portainer/portainer
32+
[phpmyadmin/phpmyadmin]: https://hub.docker.com/r/phpmyadmin/phpmyadmin
33+
[portainer/portainer]: https://hub.docker.com/portainer/portainer
3234
[_/node]: https://hub.docker.com/_/node
3335
[_/traefik]: https://hub.docker.com/_/traefik
3436

3537
The Drupal stack consist of the following containers:
3638

37-
| Container | Versions | Service name | Image | Enabled by default |
38-
| --------- | -------- | ------------ | ----- | ------------------ |
39-
| Nginx | 1.13, 1.12 | nginx | [wodby/drupal-nginx] | ✓ |
40-
| Apache | 2.4 | apache | [wodby/drupal-apache] | |
41-
| Drupal | 8, 7, 6 | php | [wodby/drupal] | ✓ |
42-
| PHP | 7.1, 7.0, 5.6, 5.3 | php | [wodby/drupal-php] | |
43-
| MariaDB | 10.1 | mariadb | [wodby/mariadb] | ✓ |
44-
| Redis | 3.2 | redis | [wodby/redis] | |
45-
| Varnish | 4.1 | varnish | [wodby/drupal-varnish] | |
46-
| Solr | 6.6-6.3, 5.5, 5.4 | solr | [wodby/drupal-solr] | |
47-
| Node.js | 1.0 | nodejs | [wodby/drupal-node] | |
48-
| Memcached | 1.4 | memcached | [wodby/memcached] | |
49-
| Rsyslog | latest | rsyslog | [wodby/rsyslog] | |
50-
| AthenaPDF | latest | athenapdf | [athenapdf-service] | |
51-
| Mailhog | latest | mailhog | [mailhog] | ✓ |
52-
| Adminer | 4.3 | adminer | [wodby/adminer] | |
53-
| phpMyAdmin | latest | pma | [phpmyadmin] | |
54-
| Node | latest | node | [_/node] | |
55-
| Portainer | latest | portainer | [portainer] | ✓ |
56-
| Traefik | latest | traefik | [_/traefik] | ✓ |
39+
| Container | Versions | Service name | Image | Enabled by default |
40+
| ---------- | ------------------ | ------------ | ---------------------------------- | ------------------ |
41+
| Nginx | 1.13, 1.12 | nginx | [wodby/drupal-nginx] | ✓ |
42+
| Apache | 2.4 | apache | [wodby/php-apache] | |
43+
| Drupal | 8, 7, 6 | php | [wodby/drupal] | ✓ |
44+
| PHP | 7.1, 7.0, 5.6, 5.3 | php | [wodby/drupal-php] | |
45+
| MariaDB | 10.1 | mariadb | [wodby/mariadb] | ✓ |
46+
| Redis | 3.2, 4.0 | redis | [wodby/redis] | |
47+
| Varnish | 4.1 | varnish | [wodby/drupal-varnish] | |
48+
| Solr | 6.6-6.3, 5.5, 5.4 | solr | [wodby/drupal-solr] | |
49+
| Node.js | 1.0 | nodejs | [wodby/drupal-node] | |
50+
| Memcached | 1.4 | memcached | [wodby/memcached] | |
51+
| Webgrind | 1.5 | webgrind | [wodby/webgrind] | |
52+
| Blackfire | latest | blackfire | [blackfire/blackfire] | |
53+
| Rsyslog | latest | rsyslog | [wodby/rsyslog] | |
54+
| AthenaPDF | 2.10.0 | athenapdf | [arachnysdocker/athenapdf-service] | |
55+
| Mailhog | latest | mailhog | [mailhog/mailhog] | ✓ |
56+
| Adminer | 4.3 | adminer | [wodby/adminer] | |
57+
| phpMyAdmin | latest | pma | [phpmyadmin/phpmyadmin] | |
58+
| Node | latest | node | [_/node] | |
59+
| Portainer | latest | portainer | [portainer/portainer] | ✓ |
60+
| Traefik | latest | traefik | [_/traefik] | ✓ |
5761

58-
Supported Drupal versions: 6, 7, 8.
62+
Supported Drupal versions: 8 / 7 / 6
5963

6064
## Documentation
6165

‎docker-compose.yml

Lines changed: 52 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2"
22

33
services:
44
mariadb:
5-
image: wodby/mariadb:10.1-2.3.3
5+
image: wodby/mariadb:10.1-2.3.5
66
environment:
77
MYSQL_ROOT_PASSWORD: password
88
MYSQL_DATABASE: drupal
@@ -14,43 +14,48 @@ services:
1414

1515
php:
1616
# 1. Images with vanilla Drupal – wodby/drupal:[DRUPAL_VERSION]-[PHP_VERSION]-[STABILITY_TAG].
17-
image: wodby/drupal:8-7.1-2.4.4
18-
# image: wodby/drupal:8-7.0-2.4.4
19-
# image: wodby/drupal:7-7.1-2.4.4
20-
# image: wodby/drupal:7-7.0-2.4.4
21-
# image: wodby/drupal:7-5.6-2.4.4
22-
# image: wodby/drupal:6-5.6-2.4.4
23-
# image: wodby/drupal:6-5.3-2.4.4
17+
image: wodby/drupal:8-7.1-3.0.0
18+
# image: wodby/drupal:8-7.0-3.0.0
19+
# image: wodby/drupal:7-7.1-3.0.0
20+
# image: wodby/drupal:7-7.0-3.0.0
21+
# image: wodby/drupal:7-5.6-3.0.0
22+
# image: wodby/drupal:6-5.6-3.0.0
23+
# image: wodby/drupal:6-5.3-3.0.0
2424
# 2. Images without Drupal – wodby/drupal-php:[PHP_VERSION]-[STABILITY_TAG].
25-
# image: wodby/drupal-php:7.1-2.4.3
26-
# image: wodby/drupal-php:7.0-2.4.3
27-
# image: wodby/drupal-php:5.6-2.4.3
28-
# image: wodby/drupal-php:5.3-2.4.3
25+
# image: wodby/drupal-php:7.1-3.0.0
26+
# image: wodby/drupal-php:7.0-3.0.0
27+
# image: wodby/drupal-php:5.6-3.0.0
28+
# image: wodby/drupal-php:5.3-3.0.0
2929
environment:
3030
PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailhog:1025
31+
PHP_FPM_CLEAR_ENV: "no"
3132
DB_HOST: mariadb
3233
DB_USER: drupal
3334
DB_PASSWORD: drupal
3435
DB_NAME: drupal
3536
DB_DRIVER: mysql
36-
# PHP_XDEBUG: 1
37-
# PHP_XDEBUG_DEFAULT_ENABLE: 1
38-
# PHP_XDEBUG_REMOTE_CONNECT_BACK: 0 # This is needed to respect remote.host setting below
39-
# PHP_XDEBUG_REMOTE_HOST: "10.254.254.254" # You will also need to 'sudo ifconfig lo0 alias 10.254.254.254'
37+
# PHP_XDEBUG: 1
38+
# PHP_XDEBUG_DEFAULT_ENABLE: 1
39+
# PHP_XDEBUG_REMOTE_CONNECT_BACK: 0
40+
# PHP_XDEBUG_REMOTE_HOST: "10.254.254.254"
41+
# PHP_XDEBUG_PROFILER_OUTPUT_DIR: /mnt/files/xdebug/profiler
42+
# PHP_XDEBUG_TRACE_OUTPUT_DIR: /mnt/files/xdebug/traces
4043
volumes:
4144
- codebase:/var/www/html
42-
# Options for macOS users (https://docker4drupal.readthedocs.io/en/latest/macos)
45+
## Options for macOS users (https://docker4drupal.readthedocs.io/en/latest/macos)
4346
# - codebase:/var/www/html:cached # User-guided caching
4447
# - docker-sync:/var/www/html # Docker-sync
48+
## For Xdebug profiler files
49+
# - files:/mnt/files
4550

4651
nginx:
4752
# wodby/drupal-nginx:[DRUPAL_VERSION]-[NGINX_VERSION]-[STABILITY_TAG].
48-
image: wodby/drupal-nginx:8-1.13-2.4.2
49-
# image: wodby/drupal-nginx:7-1.13-2.4.2
50-
# image: wodby/drupal-nginx:6-1.13-2.4.2
51-
# image: wodby/drupal-nginx:8-1.12-2.4.2
52-
# image: wodby/drupal-nginx:7-1.12-2.4.2
53-
# image: wodby/drupal-nginx:6-1.12-2.4.2
53+
image: wodby/drupal-nginx:8-1.13-3.0.1
54+
# image: wodby/drupal-nginx:7-1.13-3.0.1
55+
# image: wodby/drupal-nginx:6-1.13-3.0.1
56+
# image: wodby/drupal-nginx:8-1.12-3.0.1
57+
# image: wodby/drupal-nginx:7-1.12-3.0.1
58+
# image: wodby/drupal-nginx:6-1.12-3.0.1
5459
depends_on:
5560
- php
5661
environment:
@@ -69,7 +74,7 @@ services:
6974
- 'traefik.frontend.rule=Host:drupal.docker.localhost'
7075

7176
# apache:
72-
# image: wodby/drupal-apache:2.4-1.0.2
77+
# image: wodby/php-apache:2.4-2.0.0
7378
# depends_on:
7479
# - php
7580
# environment:
@@ -87,7 +92,7 @@ services:
8792
# - 'traefik.frontend.rule=Host:drupal.docker.localhost'
8893

8994
# varnish:
90-
# image: wodby/drupal-varnish:4.1-2.1.2
95+
# image: wodby/drupal-varnish:4.1-2.2.0
9196
# depends_on:
9297
# - nginx
9398
# environment:
@@ -100,7 +105,8 @@ services:
100105
# - 'traefik.frontend.rule=Host:varnish.drupal.docker.localhost'
101106

102107
# redis:
103-
# image: wodby/redis:3.2-2.1.2
108+
# image: wodby/redis:3.2-2.1.3
109+
## image: wodby/redis:4.0-2.1.3
104110

105111
# adminer:
106112
# image: wodby/adminer:4.3-1.1.0
@@ -178,7 +184,7 @@ services:
178184
# image: wodby/rsyslog
179185

180186
# athenapdf:
181-
# image: arachnysdocker/athenapdf-service
187+
# image: arachnysdocker/athenapdf-service:2.10.0
182188
# environment:
183189
# WEAVER_AUTH_KEY: weaver-auth-key
184190
# WEAVER_ATHENA_CMD: "athenapdf -S"
@@ -187,6 +193,23 @@ services:
187193
# WEAVER_WORKER_TIMEOUT: 90
188194
# WEAVER_CONVERSION_FALLBACK: false
189195

196+
# blackfire:
197+
# image: blackfire/blackfire
198+
# environment:
199+
# BLACKFIRE_SERVER_ID: XXXXX
200+
# BLACKFIRE_SERVER_TOKEN: YYYYY
201+
202+
# webgrind:
203+
# image: wodby/webgrind:1.5-1.0.0
204+
# environment:
205+
# WEBGRIND_PROFILER_DIR: /mnt/files/xdebug/profiler
206+
# labels:
207+
# - 'traefik.backend=webgrind'
208+
# - 'traefik.port=8080'
209+
# - 'traefik.frontend.rule=Host:webgrind.drupal.docker.localhost'
210+
# volumes:
211+
# - files:/mnt/files
212+
190213
portainer:
191214
image: portainer/portainer
192215
command: --no-auth -H unix:///var/run/docker.sock
@@ -211,3 +234,5 @@ volumes:
211234
## Docker-sync for macOS users
212235
# docker-sync:
213236
# external: true
237+
## For Xdebug profiler
238+
# files:

‎docs/access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ $ docker-compose exec [service] sh
77

88
Make sure you're using correct users to access the container, e.g. use user www-data (82) for Nginx and PHP containers:
99
```bash
10-
$ docker-compose exec --user=82 php sh
10+
$ docker-compose exec php sh
1111
```

0 commit comments

Comments
 (0)