Skip to content
Snippets Groups Projects
Commit 0e01f5e1 authored by jurgenhaas's avatar jurgenhaas
Browse files

#6 Update to 2.4.0

parent d137740a
No related branches found
No related tags found
No related merge requests found
Pipeline #
......@@ -229,6 +229,14 @@ To overwrite the default settings for the Docker environment, add the relevant p
"athenapdf": {
"enable": 0,
"key": ""
},
"blackfire": {
"enable": 0,
"id": "",
"token": ""
},
"webgrind": {
"enable": 0
}
}
}
......
......@@ -241,6 +241,14 @@ class Handler {
'enable' => 0,
'key' => '',
],
'blackfire' => [
'enable' => 0,
'id' => '',
'token' => '',
],
'webgrind' => [
'enable' => 0,
],
];
return $options;
}
......
......@@ -25,18 +25,31 @@ services:
PHP_XDEBUG_REMOTE_HOST: {{ docker0.ip }}
PHP_IDE_CONFIG: serverName=Docker
PHP_XDEBUG_REMOTE_CONNECT_BACK: 1
{% if webgrind.enable %}
PHP_XDEBUG_PROFILER_ENABLE: 1
PHP_XDEBUG_PROFILER_ENABLE_TRIGGER: 1
PHP_XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE: 1
PHP_XDEBUG_PROFILER_OUTPUT_DIR: /mnt/files/xdebug/profiler
PHP_XDEBUG_TRACE_OUTPUT_DIR: /mnt/files/xdebug/traces
{% endif %}
{% endif %}
{% if blackfire.enable %}
PHP_BLACKFIRE: 1
{% endif %}
SSH_AUTH_SOCK: /ssh-agent
volumes:
- ./:/var/www/html
- ./drush:/etc/drush
- $SSH_AUTH_SOCK:/ssh-agent
{% if webgrind.enable %}
- files:/mnt/files
{% endif %}
{{ webserver.type }}:
{% if webserver.type == 'nginx' %}
image: 'wodby/drupal-nginx:{{ drupal.version }}-{{ webserver.version }}'
{% elseif webserver.type == 'apache' %}
image: 'wodby/drupal-apache:2.4'
image: 'wodby/php-apache:2.4'
{% endif %}
depends_on:
- php
......@@ -162,3 +175,25 @@ services:
WEAVER_WORKER_TIMEOUT: 90
WEAVER_CONVERSION_FALLBACK: false
{% endif %}
{% if blackfire.enable %}
blackfire:
image: 'blackfire/blackfire'
environment:
BLACKFIRE_SERVER_ID: '{{ blackfire.id }}'
BLACKFIRE_SERVER_TOKEN: '{{ blackfire.token }}'
{% endif %}
{% if webgrind.enable %}
webgrind:
# add XDEBUG_PROFILE=1 to your request to profile that
image: 'wodby/webgrind:1.5'
environment:
WEBGRIND_PROFILER_DIR: '/mnt/files/xdebug/profiler'
labels:
- 'traefik.backend={{ projectname }}_webgrind_1'
- 'traefik.port=8080'
- 'traefik.frontend.rule=Host:webgrind.{{ projectname }}.docker.localhost'
volumes:
- files:/mnt/files
{% endif %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment