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
e94f70ef
There was a problem fetching the pipeline summary.
Commit
e94f70ef
authored
7 years ago
by
jurgenhaas
Browse files
Options
Downloads
Patches
Plain Diff
#3
Update to docker4drupal 2.3.0
parent
ccd36e93
No related branches found
No related tags found
No related merge requests found
Pipeline
#
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Handler.php
+15
-2
15 additions, 2 deletions
src/Handler.php
templates/docker-compose.yml.twig
+54
-16
54 additions, 16 deletions
templates/docker-compose.yml.twig
with
69 additions
and
18 deletions
src/Handler.php
+
15
−
2
View file @
e94f70ef
...
...
@@ -200,8 +200,9 @@ class Handler {
'version'
=>
'7.0'
,
# 5.3|5.6|7.1
'xdebug'
=>
1
,
],
'nginx'
=>
[
'version'
=>
'1.10'
,
'webserver'
=>
[
'type'
=>
'nginx'
,
# apache
'version'
=>
'1.13'
,
],
'varnish'
=>
[
'enable'
=>
0
,
...
...
@@ -211,6 +212,18 @@ class Handler {
],
'node'
=>
[
'enable'
=>
0
,
'key'
=>
''
,
'path'
=>
''
,
],
'memcached'
=>
[
'enable'
=>
0
,
],
'rsyslog'
=>
[
'enable'
=>
0
,
],
'athenapdf'
=>
[
'enable'
=>
0
,
'key'
=>
''
,
],
];
return
$options
;
...
...
This diff is collapsed.
Click to expand it.
templates/docker-compose.yml.twig
+
54
−
16
View file @
e94f70ef
...
...
@@ -2,7 +2,7 @@ version: "2"
services:
mariadb:
image: wodby/mariadb:10.1-2.
0.0
image:
'
wodby/mariadb:10.1-2.
3.3'
environment:
MYSQL_ROOT_PASSWORD: password
MYSQL_DATABASE: drupal
...
...
@@ -10,7 +10,7 @@ services:
MYSQL_PASSWORD: drupal
php:
image: wodby/drupal-php:
{{
php.version
}}
-2.
0.0
image:
'
wodby/drupal-php:
{{
php.version
}}
-2.
4.3'
environment:
PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailhog:1025
{%
if
php.xdebug
%}
...
...
@@ -27,28 +27,32 @@ services:
- ./drush:/etc/drush
- $SSH_AUTH_SOCK:/ssh-agent
nginx:
image: wodby/drupal-nginx:
{{
drupal.version
}}
-
{{
nginx.version
}}
{{
webserver.type
}}
:
{%
if
webserver.type
==
'nginx'
%}
image: 'wodby/drupal-nginx:
{{
drupal.version
}}
-
{{
webserver.version
}}
-2.4.2'
{%
elseif
webserver.type
==
'apache'
%}
image: 'wodby/drupal-apache:2.4-1.0.2'
{%
endif
%}
depends_on:
- php
environment:
NGINX
_BACKEND_HOST: php
NGINX
_SERVER_ROOT: /var/www/html/
{{
webRoot
}}
{{
webserver.type
|
upper
}}
_BACKEND_HOST: php
{{
webserver.type
|
upper
}}
_SERVER_ROOT: /var/www/html/
{{
webRoot
}}
volumes:
- ./:/var/www/html
labels:
- 'traefik.backend=
{{
projectname
}}
_
nginx
_1'
- 'traefik.backend=
{{
projectname
}}
_
{{
webserver.type
}}
_1'
- 'traefik.port=80'
- 'traefik.frontend.rule=Host:
{{
projectname
}}
.docker.localhost'
{%
if
varnish.enable
%}
varnish:
image: wodby/drupal-varnish:4.1-2.
0.0
image:
'
wodby/drupal-varnish:4.1-2.
1.2'
depends_on:
-
nginx
-
{{
webserver.type
}}
environment:
VARNISH_SECRET: secret
VARNISH_BACKEND_HOST:
nginx
VARNISH_BACKEND_HOST:
{{
webserver.type
}}
VARNISH_BACKEND_PORT: 80
labels:
- 'traefik.backend=
{{
projectname
}}
_varnish_1'
...
...
@@ -57,10 +61,10 @@ services:
{%
endif
%}
redis:
image: wodby/redis:3.2-2.
0.1
image:
'
wodby/redis:3.2-2.
1.2'
pma:
image: phpmyadmin/phpmyadmin
image:
'
phpmyadmin/phpmyadmin
'
environment:
PMA_HOST: mariadb
PMA_USER: drupal
...
...
@@ -74,7 +78,7 @@ services:
{%
if
solr.enable
%}
solr:
image: wodby/drupal-solr:
8
-6.
4
-2.
0
.0
image:
'
wodby/drupal-solr:
{{
drupal.version
}}
-6.
6
-2.
2
.0
'
environment:
SOLR_HEAP: 1024m
labels:
...
...
@@ -84,15 +88,27 @@ services:
{%
endif
%}
mailhog:
image: mailhog/mailhog
image:
'
mailhog/mailhog
'
labels:
- 'traefik.backend=
{{
projectname
}}
_mailhog_1'
- 'traefik.port=8025'
- 'traefik.frontend.rule=Host:mailhog.
{{
projectname
}}
.docker.localhost'
{%
if
node.enable
%}
nodejs:
image: 'wodby/drupal-node:1.0-1.0.0'
environment:
NODE_SERVICE_KEY: '
{{
node.key
}}
'
labels:
- 'traefik.backend=nodejs'
- 'traefik.port=8080'
- 'traefik.frontend.rule=Host:nodejs.
{{
projectname
}}
.docker.localhost'
volumes:
- ./
{{
node.path
}}
:/app
command: sh -c 'npm install
&&
npm run start'
node:
image: node:
7-
alpine
image:
'
node:alpine
'
working_dir: /app
labels:
- 'traefik.backend=
{{
projectname
}}
_node_1'
...
...
@@ -101,6 +117,28 @@ services:
expose:
- "3000"
volumes:
- ./
path/to/your/single-page-app
:/app
- ./
{{
node.path
}}
:/app
command: sh -c 'npm install
&&
npm run start'
{%
endif
%}
{%
if
memcached.enable
%}
memcached:
image: 'wodby/memcached:1.4-2.0.0'
{%
endif
%}
{%
if
rsyslog.enable
%}
rsyslog:
image: 'wodby/rsyslog'
{%
endif
%}
{%
if
athenapdf.enable
%}
athenapdf:
image: 'arachnysdocker/athenapdf-service'
environment:
WEAVER_AUTH_KEY: '
{{
athenapdf.key
}}
'
WEAVER_ATHENA_CMD: "athenapdf -S"
WEAVER_MAX_WORKERS: 10
WEAVER_MAX_CONVERSION_QUEUE: 50
WEAVER_WORKER_TIMEOUT: 90
WEAVER_CONVERSION_FALLBACK: false
{%
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