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
eecf534f
Commit
eecf534f
authored
2 years ago
by
jurgenhaas
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into 'main'
Merging develop into main See merge request
!62
parents
35e61554
f5135330
No related branches found
No related tags found
1 merge request
!62
Merging develop into main
Pipeline
#783474
passed
2 years ago
Stage: test
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
templates/docker-compose.yml.twig
+30
-2
30 additions, 2 deletions
templates/docker-compose.yml.twig
with
30 additions
and
2 deletions
templates/docker-compose.yml.twig
+
30
−
2
View file @
eecf534f
...
...
@@ -163,7 +163,7 @@ services:
{%
endif
%}
traefik.http.routers.
{{
webserver.type
}}
-
{{
projectname
}}
.rule: Host(`
{{
projectdomain
}}
`)
{%
for
domain
in
extradomains
|
default
([])
%}
|| Host(`
{{
domain
}}
`)
{%
endfor
%}
{%
if
drupal.live
|
default
(
0
)
%}
{%
if
drupal.live
|
default
(
0
)
or
traefik.usessl
%}
traefik.http.routers.
{{
webserver.type
}}
-
{{
projectname
}}
.tls: 'true'
traefik.http.routers.
{{
webserver.type
}}
-
{{
projectname
}}
.tls.certresolver: lakedrops
{%
endif
%}
...
...
@@ -206,6 +206,10 @@ services:
traefik.enable: 'true'
traefik.docker.network: traefik-public
traefik.http.routers.varnish-
{{
projectname
}}
.rule: Host(`varnish-
{{
projectdomain
}}
`)
{%
if
drupal.live
|
default
(
0
)
or
traefik.usessl
%}
traefik.http.routers.varnish-
{{
projectname
}}
.tls: 'true'
traefik.http.routers.varnish-
{{
projectname
}}
.tls.certresolver: lakedrops
{%
endif
%}
{%
endif
%}
...
...
@@ -238,6 +242,10 @@ services:
traefik.docker.network: traefik-public
traefik.http.services.
{{
projectname
}}
_adminer.loadbalancer.server.port: 9000
traefik.http.routers.adminer-
{{
projectname
}}
.rule: Host(`adminer-
{{
projectdomain
}}
`)
{%
if
drupal.live
|
default
(
0
)
or
traefik.usessl
%}
traefik.http.routers.adminer-
{{
projectname
}}
.tls: 'true'
traefik.http.routers.adminer-
{{
projectname
}}
.tls.certresolver: lakedrops
{%
endif
%}
{%
elseif
dbbrowser.type
==
'pma'
%}
pma:
image: '
{{
docker_image_prefix
}}
phpmyadmin/phpmyadmin:latest'
...
...
@@ -259,6 +267,10 @@ services:
traefik.enable: 'true'
traefik.docker.network: traefik-public
traefik.http.routers.pma-
{{
projectname
}}
.rule: Host(`pma-
{{
projectdomain
}}
`)
{%
if
drupal.live
|
default
(
0
)
or
traefik.usessl
%}
traefik.http.routers.pma-
{{
projectname
}}
.tls: 'true'
traefik.http.routers.pma-
{{
projectname
}}
.tls.certresolver: lakedrops
{%
endif
%}
{%
endif
%}
{%
endif
%}
{%
if
solr.enable
%}
...
...
@@ -281,6 +293,10 @@ services:
traefik.docker.network: traefik-public
traefik.http.services.
{{
projectname
}}
_solr.loadbalancer.server.port: 8983
traefik.http.routers.solr-
{{
projectname
}}
.rule: Host(`solr-
{{
projectdomain
}}
`)
{%
if
drupal.live
|
default
(
0
)
or
traefik.usessl
%}
traefik.http.routers.solr-
{{
projectname
}}
.tls: 'true'
traefik.http.routers.solr-
{{
projectname
}}
.tls.certresolver: lakedrops
{%
endif
%}
{%
endif
%}
{%
if
mailhog.enable
and
(
not
drupal.live
|
default
(
0
)
or
staging
)
%}
...
...
@@ -308,7 +324,7 @@ services:
{%
endif
%}
traefik.http.services.
{{
projectname
}}
_mailhog.loadbalancer.server.port: 8025
traefik.http.routers.mailhog-
{{
projectname
}}
.rule: Host(`mailhog-
{{
projectdomain
}}
`)
{%
if
drupal.live
|
default
(
0
)
%}
{%
if
drupal.live
|
default
(
0
)
or
traefik.usessl
%}
traefik.http.routers.mailhog-
{{
projectname
}}
.tls: 'true'
traefik.http.routers.mailhog-
{{
projectname
}}
.tls.certresolver: lakedrops
{%
endif
%}
...
...
@@ -327,6 +343,10 @@ services:
traefik.docker.network: traefik-public
traefik.http.services.
{{
projectname
}}
_nodejs.loadbalancer.server.port: 8080
traefik.http.routers.nodejs-
{{
projectname
}}
.rule: Host(`nodejs-
{{
projectdomain
}}
`)
{%
if
drupal.live
|
default
(
0
)
or
traefik.usessl
%}
traefik.http.routers.nodejs-
{{
projectname
}}
.tls: 'true'
traefik.http.routers.nodejs-
{{
projectname
}}
.tls.certresolver: lakedrops
{%
endif
%}
volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
...
...
@@ -344,6 +364,10 @@ services:
traefik.docker.network: traefik-public
traefik.http.services.
{{
projectname
}}
_node.loadbalancer.server.port: 3000
traefik.http.routers.node-
{{
projectname
}}
.rule: Host(`front-
{{
projectdomain
}}
`)
{%
if
drupal.live
|
default
(
0
)
or
traefik.usessl
%}
traefik.http.routers.node-
{{
projectname
}}
.tls: 'true'
traefik.http.routers.node-
{{
projectname
}}
.tls.certresolver: lakedrops
{%
endif
%}
expose:
- '3000'
volumes:
...
...
@@ -418,6 +442,10 @@ services:
traefik.docker.network: traefik-public
traefik.http.services.
{{
projectname
}}
_webgrind.loadbalancer.server.port: 8080
traefik.http.routers.webgrind-
{{
projectname
}}
.rule: Host(`webgrind-
{{
projectdomain
}}
`)
{%
if
drupal.live
|
default
(
0
)
or
traefik.usessl
%}
traefik.http.routers.webgrind-
{{
projectname
}}
.tls: 'true'
traefik.http.routers.webgrind-
{{
projectname
}}
.tls.certresolver: lakedrops
{%
endif
%}
volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
...
...
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