Skip to content

Commit bdc96b6

Browse files
authored
Traefik: use compose verson 3.12 (#1070)
Since introduction of traefik healthcheck we need settings that are not supported by 3.7 Bonus: * Remove unused dns and http compose files Related PR(s): * #1068
1 parent 6663c28 commit bdc96b6

9 files changed

+0
-98
lines changed

services/traefik/Makefile

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ include ${REPO_BASE_DIR}/scripts/common.Makefile
1313
up-local: .init .create_secrets ${TEMP_COMPOSE}-local prune-docker-stack-configs ## Deploys the stack using provided certificates
1414
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-local ${STACK_NAME}
1515

16-
.PHONY: up-letsencrypt-http
17-
up-letsencrypt-http: .init ${TEMP_COMPOSE}-letsencrypt-http prune-docker-stack-configs ## Deploys the stack with let's encrypt http challenge
18-
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-letsencrypt-http ${STACK_NAME}
19-
20-
.PHONY: up-letsencrypt-dns
21-
up-letsencrypt-dns: .init ${TEMP_COMPOSE}-letsencrypt-dns prune-docker-stack-configs ## Deploys the stack with let's encrypt dns challenge
22-
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dns ${STACK_NAME}
23-
2416
.PHONY: up-dalco
2517
up-dalco: .init ${TEMP_COMPOSE}-dalco prune-docker-stack-configs ## Deploys the stack on dalco cluster
2618
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dalco ${STACK_NAME}
@@ -56,20 +48,6 @@ ${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.local.yml .env
5648
set +o allexport; \
5749
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.local.yml > $@
5850

59-
.PHONY: ${TEMP_COMPOSE}-letsencrypt-http
60-
${TEMP_COMPOSE}-letsencrypt-http: docker-compose.yml docker-compose.letsencrypt.http.yml .env
61-
@set -o allexport; \
62-
source .env; \
63-
set +o allexport; \
64-
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.http.yml > $@
65-
66-
.PHONY: ${TEMP_COMPOSE}-letsencrypt-dns
67-
${TEMP_COMPOSE}-letsencrypt-dns: docker-compose.yml docker-compose.letsencrypt.dns.yml .env
68-
@set -o allexport; \
69-
source .env; \
70-
set +o allexport; \
71-
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.dns.yml > $@
72-
7351
.PHONY: ${TEMP_COMPOSE}-aws
7452
${TEMP_COMPOSE}-aws: docker-compose.yml docker-compose.aws.yml .env
7553
@set -o allexport; \

services/traefik/docker-compose.aws.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: "3.7"
21
services:
32
traefik:
43
command:

services/traefik/docker-compose.dalco.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: "3.7"
21
services:
32
traefik:
43
command:

services/traefik/docker-compose.letsencrypt.dns.yml.j2

Lines changed: 0 additions & 19 deletions
This file was deleted.

services/traefik/docker-compose.letsencrypt.http.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

services/traefik/docker-compose.local.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.7"
2-
31
services:
42
traefik:
53
command:

services/traefik/docker-compose.master.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: "3.7"
21
services:
32
traefik:
43
command:

services/traefik/docker-compose.public.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: "3.7"
21
services:
32
traefik:
43
dns: 8.8.8.8 # This is critical to make the ACME challange work

services/traefik/docker-compose.yml.j2

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.7"
2-
31
services:
42
traefik:
53
image: "traefik:v3.4.0"

0 commit comments

Comments
 (0)