Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Docker for Drupal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Composer
plugin
Docker for Drupal
Commits
0e01f5e1
There was a problem fetching the pipeline summary.
Commit
0e01f5e1
authored
7 years ago
by
jurgenhaas
Browse files
Options
Downloads
Patches
Plain Diff
#6
Update to 2.4.0
parent
d137740a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+8
-0
8 additions, 0 deletions
README.md
src/Handler.php
+8
-0
8 additions, 0 deletions
src/Handler.php
templates/docker-compose.yml.twig
+36
-1
36 additions, 1 deletion
templates/docker-compose.yml.twig
with
52 additions
and
1 deletion
README.md
+
8
−
0
View file @
0e01f5e1
...
...
@@ -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
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/Handler.php
+
8
−
0
View file @
0e01f5e1
...
...
@@ -241,6 +241,14 @@ class Handler {
'enable'
=>
0
,
'key'
=>
''
,
],
'blackfire'
=>
[
'enable'
=>
0
,
'id'
=>
''
,
'token'
=>
''
,
],
'webgrind'
=>
[
'enable'
=>
0
,
],
];
return
$options
;
}
...
...
This diff is collapsed.
Click to expand it.
templates/docker-compose.yml.twig
+
36
−
1
View file @
0e01f5e1
...
...
@@ -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
%}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment