Skip to content

Commit

Permalink
Add support for traefik 2 locally and signal intent to disable router…
Browse files Browse the repository at this point in the history
…s by default
  • Loading branch information
andytson-inviqa committed Feb 28, 2022
1 parent 64f9fca commit 9e959d6
Show file tree
Hide file tree
Showing 21 changed files with 35 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
blackfire:
image: {{ @('services.blackfire.image') }}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
environment: {{ to_nice_yaml(deep_merge([
@('services.blackfire.environment'),
Expand Down
1 change: 1 addition & 0 deletions src/_base/_twig/docker-compose.yml/service/chrome.yml.twig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
image: quay.io/inviqa_images/chromium:latest
{% endif %}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
networks:
- private
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
image: {{ @('services.console.image') }}
{% endif %}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
environment: {{ to_nice_yaml(deep_merge([
@('services.php-base.environment'),
Expand Down
1 change: 1 addition & 0 deletions src/_base/_twig/docker-compose.yml/service/cron.yml.twig
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@
networks:
- private
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
elasticsearch:
image: {{ @('services.elasticsearch.image') }}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
environment:
ES_JAVA_OPTS: -Xms512m -Xmx512m
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
memcached:
image: {{ @('services.memcached.image') }}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
networks:
- private
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
@('services.mongodb.environment_secrets')
]), 2, 6) | raw }}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
networks:
- private
Expand Down
1 change: 1 addition & 0 deletions src/_base/_twig/docker-compose.yml/service/mysql.yml.twig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
mysql:
image: {{ @('services.mysql.image') }}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
command: {{ to_nice_yaml(command, 2, 6) }}
environment: {{ to_nice_yaml(deep_merge([
Expand Down
9 changes: 8 additions & 1 deletion src/_base/_twig/docker-compose.yml/service/nginx.yml.twig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% endif %}
{% set hostnames = [@('hostname')] %}
{% set hostnames = hostnames|merge(@('hostname_aliases')|map(alias => "#{alias}." ~ @('domain'))) %}

{% set traefikRules = hostnames|map(hostname => "Host(`" ~ hostname ~ "`)")}
nginx:
build: .my127ws/docker/image/nginx
{% if @('app.build') == 'dynamic' %}
Expand All @@ -15,12 +15,19 @@
{% endif %}
labels:
{% if @('services.varnish.enabled') %}
# deprecated, a later workspace release will disable by default
- traefik.enable=false
{% else %}
# Traefik 1, deprecated
- traefik.backend={{ @('workspace.name') }}
- traefik.frontend.rule=Host:{{ hostnames|join(',') }}
- traefik.docker.network=my127ws
- traefik.port=80
# Traefik 2
- traefik.enable=true
# - traefik.docker.network=my127ws
- traefik.http.routers.{{ @('workspace.name') }}-nginx.rule={{ traefikRules | join(' || ') }}
- traefik.http.services.{{ @('workspace.name') }}-nginx.loadbalancer.server.port=80
{% endif %}
environment: {{ to_nice_yaml(deep_merge([
@('services.nginx.environment'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
@('services.php-fpm-exporter.environment_secrets')
]), 2, 6) | raw }}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
depends_on:
- php-fpm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
image: {{ @('services.php-fpm.image') }}
{% endif %}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
networks:
- private
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
postgres:
image: {{ @('services.postgres.image') }}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
environment: {{ to_nice_yaml(deep_merge([
@('services.postgres.environment'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# 1GB; evict key that would expire soonest
command: redis-server --maxmemory 1073742000 --maxmemory-policy volatile-ttl --save 3600 1 --save 300 100 --save 60 10000
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
networks:
- private
1 change: 1 addition & 0 deletions src/_base/_twig/docker-compose.yml/service/redis.yml.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# 1GB; evict any least recently used key even if they don't have a TTL
command: redis-server --maxmemory 1073742000 --maxmemory-policy allkeys-lru --save 3600 1 --save 300 100 --save 60 10000
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
networks:
- private
1 change: 1 addition & 0 deletions src/_base/_twig/docker-compose.yml/service/relay.yml.twig
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
relay:
build: .my127ws/docker/image/relay
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
networks:
private:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
tideways:
image: {{ @('services.tideways.image') }}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
environment: {{ to_nice_yaml(deep_merge([
@('services.tideways.environment'),
Expand Down
8 changes: 8 additions & 0 deletions src/_base/_twig/docker-compose.yml/service/varnish.yml.twig
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
{% if @('services.varnish.enabled') %}
{% set hostnames = [@('hostname')] %}
{% set hostnames = hostnames|merge(@('hostname_aliases')|map(alias => "#{alias}." ~ @('domain'))) %}
{% set traefikRules = hostnames|map(hostname => "Host(`" ~ hostname ~ "`)")}
varnish:
image: {{ @('services.varnish.image') }}
labels:
# Traefik 1, deprecated
- traefik.backend={{ @('workspace.name') }}
- traefik.frontend.rule=Host:{{ hostnames|join(',') }}
- traefik.docker.network=my127ws
- traefik.port=80
# Traefik 2
- traefik.enable=true
# - traefik.docker.network=my127ws
- traefik.http.routers.{{ @('workspace.name') }}-nginx.rule={{ traefikRules | join(' || ') }}
- traefik.http.services.{{ @('workspace.name') }}-nginx.loadbalancer.server.port=80
environment: {{ to_nice_yaml(deep_merge([
@('services.varnish.environment'),
@('services.varnish.environment_dynamic'),
Expand Down Expand Up @@ -37,6 +44,7 @@
build:
context: .my127ws/docker/image/tls-offload/
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
links:
- varnish:varnish
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@
networks:
- private
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
image: {{ @('services.php-fpm.image') }}
{% endif %}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
networks:
- private
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
image: {{ @('services.console.image') }}
{% endif %}
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false
environment: {{ to_nice_yaml(deep_merge([
@('services.php-base.environment'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@
networks:
- private
labels:
# deprecated, a later workspace release will disable by default
- traefik.enable=false

0 comments on commit 9e959d6

Please sign in to comment.