Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions services/traefik/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@ include ${REPO_BASE_DIR}/scripts/common.Makefile
up-local: .init .create_secrets ${TEMP_COMPOSE}-local prune-docker-stack-configs ## Deploys the stack using provided certificates
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-local ${STACK_NAME}

.PHONY: up-letsencrypt-http
up-letsencrypt-http: .init ${TEMP_COMPOSE}-letsencrypt-http prune-docker-stack-configs ## Deploys the stack with let's encrypt http challenge
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-letsencrypt-http ${STACK_NAME}

.PHONY: up-letsencrypt-dns
up-letsencrypt-dns: .init ${TEMP_COMPOSE}-letsencrypt-dns prune-docker-stack-configs ## Deploys the stack with let's encrypt dns challenge
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dns ${STACK_NAME}

.PHONY: up-dalco
up-dalco: .init ${TEMP_COMPOSE}-dalco prune-docker-stack-configs ## Deploys the stack on dalco cluster
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dalco ${STACK_NAME}
Expand Down Expand Up @@ -56,20 +48,6 @@ ${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.local.yml .env
set +o allexport; \
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.local.yml > $@

.PHONY: ${TEMP_COMPOSE}-letsencrypt-http
${TEMP_COMPOSE}-letsencrypt-http: docker-compose.yml docker-compose.letsencrypt.http.yml .env
@set -o allexport; \
source .env; \
set +o allexport; \
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.http.yml > $@

.PHONY: ${TEMP_COMPOSE}-letsencrypt-dns
${TEMP_COMPOSE}-letsencrypt-dns: docker-compose.yml docker-compose.letsencrypt.dns.yml .env
@set -o allexport; \
source .env; \
set +o allexport; \
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.dns.yml > $@

.PHONY: ${TEMP_COMPOSE}-aws
${TEMP_COMPOSE}-aws: docker-compose.yml docker-compose.aws.yml .env
@set -o allexport; \
Expand Down
1 change: 0 additions & 1 deletion services/traefik/docker-compose.aws.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.7"
services:
traefik:
command:
Expand Down
1 change: 0 additions & 1 deletion services/traefik/docker-compose.dalco.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.7"
services:
traefik:
command:
Expand Down
19 changes: 0 additions & 19 deletions services/traefik/docker-compose.letsencrypt.dns.yml.j2

This file was deleted.

49 changes: 0 additions & 49 deletions services/traefik/docker-compose.letsencrypt.http.yml

This file was deleted.

2 changes: 0 additions & 2 deletions services/traefik/docker-compose.local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
traefik:
command:
Expand Down
1 change: 0 additions & 1 deletion services/traefik/docker-compose.master.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.7"
services:
traefik:
command:
Expand Down
1 change: 0 additions & 1 deletion services/traefik/docker-compose.public.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.7"
services:
traefik:
dns: 8.8.8.8 # This is critical to make the ACME challange work
Expand Down
2 changes: 0 additions & 2 deletions services/traefik/docker-compose.yml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
traefik:
image: "traefik:v3.4.0"
Expand Down
Loading