From eaef6b8f583ff1c50c0dafd1eb51bc3022c06bc9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 11:35:33 +0200 Subject: [PATCH 01/10] Using Stonehenge (Traefik) --- docker-compose.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 079c68c..626d228 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,9 +15,6 @@ services: drupal: build: . - ports: - - 80:80 - - 443:443 volumes: - /app/public/modules - /app/public/profiles @@ -27,9 +24,27 @@ services: # existing content of the image at the same location - /app/public/sites restart: always + labels: + traefik.enable: true + traefik.http.routers.frankenphp-drupal.entrypoints: https + traefik.http.routers.frankenphp-drupal.rule: Host(`frankenphp-drupal.docker.so`) + traefik.http.routers.frankenphp-drupal.tls: true + traefik.http.services.frankenphp-drupal.loadbalancer.server.port: 80 + traefik.docker.network: stonehenge-network + environment: + SERVER_NAME: :80 + networks: + - default + - stonehenge-network postgres: image: postgres environment: POSTGRES_PASSWORD: example restart: always + networks: + - default + +networks: + stonehenge-network: + external: true From 15fbc08b185b86c50fad5da36ae73dcaa4c7ebe7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 06:51:08 +0300 Subject: [PATCH 02/10] compose.override.yaml --- compose.override.yaml | 19 +++++++++++++++++++ compose.yaml | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 compose.override.yaml diff --git a/compose.override.yaml b/compose.override.yaml new file mode 100644 index 0000000..d6aea4f --- /dev/null +++ b/compose.override.yaml @@ -0,0 +1,19 @@ +services: + + drupal: + environment: + SERVER_NAME: :80 + labels: + traefik.enable: true + traefik.http.routers.frankenphp-drupal.entrypoints: https + traefik.http.routers.frankenphp-drupal.rule: Host(`frankenphp-drupal.docker.so`) + traefik.http.routers.frankenphp-drupal.tls: true + traefik.http.services.frankenphp-drupal.loadbalancer.server.port: 80 + traefik.docker.network: stonehenge-network + networks: + - default + - stonehenge-network + +networks: + stonehenge-network: + external: true diff --git a/compose.yaml b/compose.yaml index 988c9d7..049584a 100644 --- a/compose.yaml +++ b/compose.yaml @@ -23,27 +23,9 @@ services: # existing content of the image at the same location - /app/public/sites restart: always - labels: - traefik.enable: true - traefik.http.routers.frankenphp-drupal.entrypoints: https - traefik.http.routers.frankenphp-drupal.rule: Host(`frankenphp-drupal.docker.so`) - traefik.http.routers.frankenphp-drupal.tls: true - traefik.http.services.frankenphp-drupal.loadbalancer.server.port: 80 - traefik.docker.network: stonehenge-network - environment: - SERVER_NAME: :80 - networks: - - default - - stonehenge-network db: image: mariadb environment: MARIADB_ROOT_PASSWORD: example restart: always - networks: - - default - -networks: - stonehenge-network: - external: true From d3188385bb0928f6af661a79aa232411683a58f9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 06:51:57 +0300 Subject: [PATCH 03/10] Get ports back --- compose.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compose.yaml b/compose.yaml index 049584a..c498349 100644 --- a/compose.yaml +++ b/compose.yaml @@ -14,6 +14,9 @@ services: drupal: build: . + ports: + - 80:80 + - 443:443 volumes: - /app/public/modules - /app/public/profiles From 016c2247e8b779687571879e1403eff983be4105 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 06:55:21 +0300 Subject: [PATCH 04/10] Reset ports in compose.override.yaml --- compose.override.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.override.yaml b/compose.override.yaml index d6aea4f..03449b3 100644 --- a/compose.override.yaml +++ b/compose.override.yaml @@ -1,6 +1,7 @@ services: drupal: + ports: !reset [] environment: SERVER_NAME: :80 labels: From f736bd30981ebf9dca4a19e47711fe073944e284 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 06:58:49 +0300 Subject: [PATCH 05/10] Add a comment about SERVER_NAME --- compose.override.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.override.yaml b/compose.override.yaml index 03449b3..b894d99 100644 --- a/compose.override.yaml +++ b/compose.override.yaml @@ -3,6 +3,7 @@ services: drupal: ports: !reset [] environment: + # This makes Traefik work SERVER_NAME: :80 labels: traefik.enable: true From b9008649af58b439a1b6aa206739c9f445ca1aeb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 11:35:33 +0200 Subject: [PATCH 06/10] Using Stonehenge (Traefik) --- compose.yaml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/compose.yaml b/compose.yaml index c498349..988c9d7 100644 --- a/compose.yaml +++ b/compose.yaml @@ -14,9 +14,6 @@ services: drupal: build: . - ports: - - 80:80 - - 443:443 volumes: - /app/public/modules - /app/public/profiles @@ -26,9 +23,27 @@ services: # existing content of the image at the same location - /app/public/sites restart: always + labels: + traefik.enable: true + traefik.http.routers.frankenphp-drupal.entrypoints: https + traefik.http.routers.frankenphp-drupal.rule: Host(`frankenphp-drupal.docker.so`) + traefik.http.routers.frankenphp-drupal.tls: true + traefik.http.services.frankenphp-drupal.loadbalancer.server.port: 80 + traefik.docker.network: stonehenge-network + environment: + SERVER_NAME: :80 + networks: + - default + - stonehenge-network db: image: mariadb environment: MARIADB_ROOT_PASSWORD: example restart: always + networks: + - default + +networks: + stonehenge-network: + external: true From 7076cdbb2fa07d481438a0211ac5b512db7d2370 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 06:51:08 +0300 Subject: [PATCH 07/10] compose.override.yaml --- compose.override.yaml | 19 +++++++++++++++++++ compose.yaml | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 compose.override.yaml diff --git a/compose.override.yaml b/compose.override.yaml new file mode 100644 index 0000000..d6aea4f --- /dev/null +++ b/compose.override.yaml @@ -0,0 +1,19 @@ +services: + + drupal: + environment: + SERVER_NAME: :80 + labels: + traefik.enable: true + traefik.http.routers.frankenphp-drupal.entrypoints: https + traefik.http.routers.frankenphp-drupal.rule: Host(`frankenphp-drupal.docker.so`) + traefik.http.routers.frankenphp-drupal.tls: true + traefik.http.services.frankenphp-drupal.loadbalancer.server.port: 80 + traefik.docker.network: stonehenge-network + networks: + - default + - stonehenge-network + +networks: + stonehenge-network: + external: true diff --git a/compose.yaml b/compose.yaml index 988c9d7..049584a 100644 --- a/compose.yaml +++ b/compose.yaml @@ -23,27 +23,9 @@ services: # existing content of the image at the same location - /app/public/sites restart: always - labels: - traefik.enable: true - traefik.http.routers.frankenphp-drupal.entrypoints: https - traefik.http.routers.frankenphp-drupal.rule: Host(`frankenphp-drupal.docker.so`) - traefik.http.routers.frankenphp-drupal.tls: true - traefik.http.services.frankenphp-drupal.loadbalancer.server.port: 80 - traefik.docker.network: stonehenge-network - environment: - SERVER_NAME: :80 - networks: - - default - - stonehenge-network db: image: mariadb environment: MARIADB_ROOT_PASSWORD: example restart: always - networks: - - default - -networks: - stonehenge-network: - external: true From 32f56e7aa639ffdb8f9c56e3cc5a3cf142c69091 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 06:51:57 +0300 Subject: [PATCH 08/10] Get ports back --- compose.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compose.yaml b/compose.yaml index 049584a..c498349 100644 --- a/compose.yaml +++ b/compose.yaml @@ -14,6 +14,9 @@ services: drupal: build: . + ports: + - 80:80 + - 443:443 volumes: - /app/public/modules - /app/public/profiles From be4417c111f5880745591458e2763fecfcae1385 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 06:55:21 +0300 Subject: [PATCH 09/10] Reset ports in compose.override.yaml --- compose.override.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.override.yaml b/compose.override.yaml index d6aea4f..03449b3 100644 --- a/compose.override.yaml +++ b/compose.override.yaml @@ -1,6 +1,7 @@ services: drupal: + ports: !reset [] environment: SERVER_NAME: :80 labels: From b1c57b6103ea286571549258c0514d37afce593e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 06:58:49 +0300 Subject: [PATCH 10/10] Add a comment about SERVER_NAME --- compose.override.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.override.yaml b/compose.override.yaml index 03449b3..b894d99 100644 --- a/compose.override.yaml +++ b/compose.override.yaml @@ -3,6 +3,7 @@ services: drupal: ports: !reset [] environment: + # This makes Traefik work SERVER_NAME: :80 labels: traefik.enable: true