The following files contain patches for Drupal 7 and Drupal 8 versions of docker-compose.yml from wodby/drupal4docker. These patches prepare a default set up for the Agile Collective Drupal file structure.
Last active
April 25, 2018 09:08
-
-
Save tanc/94ea8b21b29cb842daa93534e2dc4b9d to your computer and use it in GitHub Desktop.
Patches for wodby/drupal4docker
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- docker-compose.yml 2018-02-08 09:35:33.000000000 +0100 | |
| +++ docker-compose.yml.7 2018-02-14 09:04:26.000000000 +0100 | |
| @@ -5,10 +5,12 @@ | |
| image: wodby/mariadb:10.2-3.0.2 | |
| # image: wodby/mariadb:10.1-3.0.2 | |
| environment: | |
| - MYSQL_ROOT_PASSWORD: password | |
| + MYSQL_ROOT_PASSWORD: root | |
| MYSQL_DATABASE: drupal | |
| MYSQL_USER: drupal | |
| MYSQL_PASSWORD: drupal | |
| + 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. | |
| @@ -26,7 +28,7 @@ | |
| php: | |
| # 1. Images with vanilla Drupal – wodby/drupal:[DRUPAL_VERSION]-[PHP_VERSION]-[STABILITY_TAG]. | |
| - image: wodby/drupal:8-7.1-3.3.2 | |
| +# image: wodby/drupal:8-7.1-3.3.2 | |
| # image: wodby/drupal:8-7.0-3.3.2 | |
| # image: wodby/drupal:7-7.1-3.3.2 | |
| # image: wodby/drupal:7-7.0-3.3.2 | |
| @@ -36,7 +38,7 @@ | |
| # 2. Images without Drupal – wodby/drupal-php:[PHP_VERSION]-[STABILITY_TAG]. | |
| # image: wodby/drupal-php:7.1-3.3.1 | |
| # image: wodby/drupal-php:7.0-3.3.1 | |
| -# image: wodby/drupal-php:5.6-3.3.1 | |
| + image: wodby/drupal-php:5.6-3.3.1 | |
| # image: wodby/drupal-php:5.3-3.3.1 | |
| # 3. Images without Drupal – wodby/drupal-php:[PHP_VERSION]-[STABILITY_TAG]. Version for development (--enable-debug) | |
| # image: wodby/drupal-php:7.1-dev-3.3.1 | |
| @@ -50,25 +52,25 @@ | |
| DB_PASSWORD: drupal | |
| DB_NAME: drupal | |
| DB_DRIVER: mysql | |
| -# 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_XDEBUG_PROFILER_OUTPUT_DIR: /mnt/files/xdebug/profiler | |
| # PHP_XDEBUG_TRACE_OUTPUT_DIR: /mnt/files/xdebug/traces | |
| # PHP_BLACKFIRE: 1 | |
| volumes: | |
| - - codebase:/var/www/html | |
| +# - codebase:/var/www/html | |
| ## Options for macOS users (https://docker4drupal.readthedocs.io/en/latest/macos) | |
| -# - codebase:/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 | |
| nginx: | |
| # wodby/drupal-nginx:[DRUPAL_VERSION]-[NGINX_VERSION]-[STABILITY_TAG]. | |
| - image: wodby/drupal-nginx:8-1.13-3.0.2 | |
| -# image: wodby/drupal-nginx:7-1.13-3.0.2 | |
| +# image: wodby/drupal-nginx:8-1.13-3.0.2 | |
| + image: wodby/drupal-nginx:7-1.13-3.0.2 | |
| # image: wodby/drupal-nginx:6-1.13-3.0.2 | |
| # image: wodby/drupal-nginx:8-1.12-3.0.2 | |
| # image: wodby/drupal-nginx:7-1.12-3.0.2 | |
| @@ -82,9 +84,9 @@ | |
| NGINX_SERVER_ROOT: /var/www/html/web | |
| # NGINX_DRUPAL_FILE_PROXY_URL: http://example.com | |
| volumes: | |
| - - codebase:/var/www/html | |
| +# - codebase:/var/www/html | |
| # Options for macOS users (https://docker4drupal.readthedocs.io/en/latest/macos) | |
| -# - codebase:/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' | |
| @@ -135,18 +137,18 @@ | |
| # - 'traefik.port=9000' | |
| # - 'traefik.frontend.rule=Host:adminer.drupal.docker.localhost' | |
| -# pma: | |
| -# image: phpmyadmin/phpmyadmin | |
| -# environment: | |
| -# PMA_HOST: mariadb | |
| -# PMA_USER: drupal | |
| -# PMA_PASSWORD: drupal | |
| -# PHP_UPLOAD_MAX_FILESIZE: 1G | |
| -# PHP_MAX_INPUT_VARS: 1G | |
| -# labels: | |
| -# - 'traefik.backend=pma' | |
| -# - 'traefik.port=80' | |
| -# - 'traefik.frontend.rule=Host:pma.drupal.docker.localhost' | |
| + pma: | |
| + image: phpmyadmin/phpmyadmin | |
| + environment: | |
| + PMA_HOST: mariadb | |
| + PMA_USER: drupal | |
| + PMA_PASSWORD: drupal | |
| + PHP_UPLOAD_MAX_FILESIZE: 1G | |
| + PHP_MAX_INPUT_VARS: 1G | |
| + labels: | |
| + - 'traefik.backend=pma' | |
| + - 'traefik.port=80' | |
| + - 'traefik.frontend.rule=Host:pma.drupal.docker.localhost' | |
| # solr: | |
| ## wodby/drupal-solr:[DRUPAL_VERSION]-[SOLR_VERSION]-[STABILITY_TAG]. | |
| @@ -244,13 +246,13 @@ | |
| image: 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 | |
| -volumes: | |
| - codebase: | |
| +#volumes: | |
| +# codebase: | |
| ## Docker-sync for macOS users | |
| # docker-sync: | |
| # external: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- docker-compose.yml 2018-02-13 11:57:20.000000000 +0100 | |
| +++ docker-compose.yml.8 2018-02-13 11:57:45.000000000 +0100 | |
| @@ -5,10 +5,12 @@ | |
| image: wodby/mariadb:10.2-3.0.2 | |
| # image: wodby/mariadb:10.1-3.0.2 | |
| environment: | |
| - MYSQL_ROOT_PASSWORD: password | |
| + MYSQL_ROOT_PASSWORD: root | |
| MYSQL_DATABASE: drupal | |
| MYSQL_USER: drupal | |
| MYSQL_PASSWORD: drupal | |
| + 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. | |
| @@ -26,7 +28,7 @@ | |
| php: | |
| # 1. Images with vanilla Drupal – wodby/drupal:[DRUPAL_VERSION]-[PHP_VERSION]-[STABILITY_TAG]. | |
| - image: wodby/drupal:8-7.1-3.3.2 | |
| +# image: wodby/drupal:8-7.1-3.3.2 | |
| # image: wodby/drupal:8-7.0-3.3.2 | |
| # image: wodby/drupal:7-7.1-3.3.2 | |
| # image: wodby/drupal:7-7.0-3.3.2 | |
| @@ -35,7 +37,7 @@ | |
| # image: wodby/drupal:6-5.3-3.3.2 | |
| # 2. Images without Drupal – wodby/drupal-php:[PHP_VERSION]-[STABILITY_TAG]. | |
| # image: wodby/drupal-php:7.1-3.3.1 | |
| -# image: wodby/drupal-php:7.0-3.3.1 | |
| + image: wodby/drupal-php:7.0-3.3.1 | |
| # image: wodby/drupal-php:5.6-3.3.1 | |
| # image: wodby/drupal-php:5.3-3.3.1 | |
| # 3. Images without Drupal – wodby/drupal-php:[PHP_VERSION]-[STABILITY_TAG]. Version for development (--enable-debug) | |
| @@ -50,17 +52,17 @@ | |
| DB_PASSWORD: drupal | |
| DB_NAME: drupal | |
| DB_DRIVER: mysql | |
| -# 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_XDEBUG_PROFILER_OUTPUT_DIR: /mnt/files/xdebug/profiler | |
| # PHP_XDEBUG_TRACE_OUTPUT_DIR: /mnt/files/xdebug/traces | |
| # PHP_BLACKFIRE: 1 | |
| volumes: | |
| - - codebase:/var/www/html | |
| +# - codebase:/var/www/html | |
| ## Options for macOS users (https://docker4drupal.readthedocs.io/en/latest/macos) | |
| -# - codebase:/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 | |
| @@ -82,9 +84,9 @@ | |
| NGINX_SERVER_ROOT: /var/www/html/web | |
| # NGINX_DRUPAL_FILE_PROXY_URL: http://example.com | |
| volumes: | |
| - - codebase:/var/www/html | |
| +# - codebase:/var/www/html | |
| # Options for macOS users (https://docker4drupal.readthedocs.io/en/latest/macos) | |
| -# - codebase:/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' | |
| @@ -135,18 +137,18 @@ | |
| # - 'traefik.port=9000' | |
| # - 'traefik.frontend.rule=Host:adminer.drupal.docker.localhost' | |
| -# pma: | |
| -# image: phpmyadmin/phpmyadmin | |
| -# environment: | |
| -# PMA_HOST: mariadb | |
| -# PMA_USER: drupal | |
| -# PMA_PASSWORD: drupal | |
| -# PHP_UPLOAD_MAX_FILESIZE: 1G | |
| -# PHP_MAX_INPUT_VARS: 1G | |
| -# labels: | |
| -# - 'traefik.backend=pma' | |
| -# - 'traefik.port=80' | |
| -# - 'traefik.frontend.rule=Host:pma.drupal.docker.localhost' | |
| + pma: | |
| + image: phpmyadmin/phpmyadmin | |
| + environment: | |
| + PMA_HOST: mariadb | |
| + PMA_USER: drupal | |
| + PMA_PASSWORD: drupal | |
| + PHP_UPLOAD_MAX_FILESIZE: 1G | |
| + PHP_MAX_INPUT_VARS: 1G | |
| + labels: | |
| + - 'traefik.backend=pma' | |
| + - 'traefik.port=80' | |
| + - 'traefik.frontend.rule=Host:pma.drupal.docker.localhost' | |
| # solr: | |
| ## wodby/drupal-solr:[DRUPAL_VERSION]-[SOLR_VERSION]-[STABILITY_TAG]. | |
| @@ -244,13 +246,13 @@ | |
| image: 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 | |
| -volumes: | |
| - codebase: | |
| +#volumes: | |
| +# codebase: | |
| ## Docker-sync for macOS users | |
| # docker-sync: | |
| # external: true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
For Drupal 7:
curl -L -O https://raw.github.com/wodby/docker4drupal/master/docker-compose.yml; curl -L https://gist.github.com/tanc/94ea8b21b29cb842daa93534e2dc4b9d/raw/drupal7.patch | patchFor Drupal 8:
curl -L -O https://raw.github.com/wodby/docker4drupal/master/docker-compose.yml; curl -L https://gist.github.com/tanc/94ea8b21b29cb842daa93534e2dc4b9d/raw/drupal8.patch | patch