diff --git a/src/_base/_twig/docker-compose.yml/service/blackfire.yml.twig b/src/_base/_twig/docker-compose.yml/service/blackfire.yml.twig index 9dc0ebabe..77803f6d9 100644 --- a/src/_base/_twig/docker-compose.yml/service/blackfire.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/blackfire.yml.twig @@ -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'), diff --git a/src/_base/_twig/docker-compose.yml/service/chrome.yml.twig b/src/_base/_twig/docker-compose.yml/service/chrome.yml.twig index 67c7b43ae..081715e0c 100644 --- a/src/_base/_twig/docker-compose.yml/service/chrome.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/chrome.yml.twig @@ -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 diff --git a/src/_base/_twig/docker-compose.yml/service/console.yml.twig b/src/_base/_twig/docker-compose.yml/service/console.yml.twig index 0427d8206..6a1325832 100644 --- a/src/_base/_twig/docker-compose.yml/service/console.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/console.yml.twig @@ -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'), diff --git a/src/_base/_twig/docker-compose.yml/service/cron.yml.twig b/src/_base/_twig/docker-compose.yml/service/cron.yml.twig index f1e204fb0..2ca47eb7e 100644 --- a/src/_base/_twig/docker-compose.yml/service/cron.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/cron.yml.twig @@ -20,4 +20,5 @@ networks: - private labels: + # deprecated, a later workspace release will disable by default - traefik.enable=false diff --git a/src/_base/_twig/docker-compose.yml/service/elasticsearch.yml.twig b/src/_base/_twig/docker-compose.yml/service/elasticsearch.yml.twig index 486384f73..049156ed8 100644 --- a/src/_base/_twig/docker-compose.yml/service/elasticsearch.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/elasticsearch.yml.twig @@ -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 diff --git a/src/_base/_twig/docker-compose.yml/service/memcached.yml.twig b/src/_base/_twig/docker-compose.yml/service/memcached.yml.twig index f5aaa50ab..0ce18fc48 100644 --- a/src/_base/_twig/docker-compose.yml/service/memcached.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/memcached.yml.twig @@ -1,6 +1,7 @@ memcached: image: {{ @('services.memcached.image') }} labels: + # deprecated, a later workspace release will disable by default - traefik.enable=false networks: - private diff --git a/src/_base/_twig/docker-compose.yml/service/mongodb.yml.twig b/src/_base/_twig/docker-compose.yml/service/mongodb.yml.twig index 83efc4366..6c8ce99a1 100644 --- a/src/_base/_twig/docker-compose.yml/service/mongodb.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/mongodb.yml.twig @@ -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 diff --git a/src/_base/_twig/docker-compose.yml/service/mysql.yml.twig b/src/_base/_twig/docker-compose.yml/service/mysql.yml.twig index 8efdc7bab..7b8043e93 100644 --- a/src/_base/_twig/docker-compose.yml/service/mysql.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/mysql.yml.twig @@ -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([ diff --git a/src/_base/_twig/docker-compose.yml/service/nginx.yml.twig b/src/_base/_twig/docker-compose.yml/service/nginx.yml.twig index 9814d29ba..6abb01a8c 100644 --- a/src/_base/_twig/docker-compose.yml/service/nginx.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/nginx.yml.twig @@ -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' %} @@ -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'), diff --git a/src/_base/_twig/docker-compose.yml/service/php-fpm-exporter.yml.twig b/src/_base/_twig/docker-compose.yml/service/php-fpm-exporter.yml.twig index e89c70f55..57d69f5e7 100644 --- a/src/_base/_twig/docker-compose.yml/service/php-fpm-exporter.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/php-fpm-exporter.yml.twig @@ -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 diff --git a/src/_base/_twig/docker-compose.yml/service/php-fpm.yml.twig b/src/_base/_twig/docker-compose.yml/service/php-fpm.yml.twig index 010034ee2..524a83d74 100644 --- a/src/_base/_twig/docker-compose.yml/service/php-fpm.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/php-fpm.yml.twig @@ -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 diff --git a/src/_base/_twig/docker-compose.yml/service/postgres.yml.twig b/src/_base/_twig/docker-compose.yml/service/postgres.yml.twig index a01fb70ee..1dbfec9c1 100644 --- a/src/_base/_twig/docker-compose.yml/service/postgres.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/postgres.yml.twig @@ -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'), diff --git a/src/_base/_twig/docker-compose.yml/service/redis-session.yml.twig b/src/_base/_twig/docker-compose.yml/service/redis-session.yml.twig index 03b6b7469..7f037d33b 100644 --- a/src/_base/_twig/docker-compose.yml/service/redis-session.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/redis-session.yml.twig @@ -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 diff --git a/src/_base/_twig/docker-compose.yml/service/redis.yml.twig b/src/_base/_twig/docker-compose.yml/service/redis.yml.twig index 8f4c98163..de561be92 100644 --- a/src/_base/_twig/docker-compose.yml/service/redis.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/redis.yml.twig @@ -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 diff --git a/src/_base/_twig/docker-compose.yml/service/relay.yml.twig b/src/_base/_twig/docker-compose.yml/service/relay.yml.twig index 1fa566b7f..01e2543b0 100644 --- a/src/_base/_twig/docker-compose.yml/service/relay.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/relay.yml.twig @@ -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: diff --git a/src/_base/_twig/docker-compose.yml/service/tideways.yml.twig b/src/_base/_twig/docker-compose.yml/service/tideways.yml.twig index c6fbe66c6..64ab93f94 100644 --- a/src/_base/_twig/docker-compose.yml/service/tideways.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/tideways.yml.twig @@ -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'), diff --git a/src/_base/_twig/docker-compose.yml/service/varnish.yml.twig b/src/_base/_twig/docker-compose.yml/service/varnish.yml.twig index 32338e331..df12ba472 100644 --- a/src/_base/_twig/docker-compose.yml/service/varnish.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/varnish.yml.twig @@ -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') }}-varnish.rule={{ traefikRules | join(' || ') }} + - traefik.http.services.{{ @('workspace.name') }}-varnish.loadbalancer.server.port=80 environment: {{ to_nice_yaml(deep_merge([ @('services.varnish.environment'), @('services.varnish.environment_dynamic'), @@ -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 diff --git a/src/akeneo/_twig/docker-compose.yml/service/job-queue-consumer.yml.twig b/src/akeneo/_twig/docker-compose.yml/service/job-queue-consumer.yml.twig index 2df06e059..5bc6782f2 100644 --- a/src/akeneo/_twig/docker-compose.yml/service/job-queue-consumer.yml.twig +++ b/src/akeneo/_twig/docker-compose.yml/service/job-queue-consumer.yml.twig @@ -20,4 +20,5 @@ networks: - private labels: + # deprecated, a later workspace release will disable by default - traefik.enable=false diff --git a/src/drupal8/_twig/docker-compose.yml/service/php-fpm.yml.twig b/src/drupal8/_twig/docker-compose.yml/service/php-fpm.yml.twig index 68266c430..761b67a36 100644 --- a/src/drupal8/_twig/docker-compose.yml/service/php-fpm.yml.twig +++ b/src/drupal8/_twig/docker-compose.yml/service/php-fpm.yml.twig @@ -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 diff --git a/src/spryker/_twig/docker-compose.yml/service/console.yml.twig b/src/spryker/_twig/docker-compose.yml/service/console.yml.twig index bad12f839..154fc6bda 100644 --- a/src/spryker/_twig/docker-compose.yml/service/console.yml.twig +++ b/src/spryker/_twig/docker-compose.yml/service/console.yml.twig @@ -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'), diff --git a/src/spryker/_twig/docker-compose.yml/service/jenkins-runner.yml.twig b/src/spryker/_twig/docker-compose.yml/service/jenkins-runner.yml.twig index 52c229f99..5289c16b9 100644 --- a/src/spryker/_twig/docker-compose.yml/service/jenkins-runner.yml.twig +++ b/src/spryker/_twig/docker-compose.yml/service/jenkins-runner.yml.twig @@ -25,4 +25,5 @@ networks: - private labels: + # deprecated, a later workspace release will disable by default - traefik.enable=false