From c21a31b2c95d1c56b8548f13d2a5be53ab69819e Mon Sep 17 00:00:00 2001 From: whitney Date: Wed, 29 May 2024 14:43:14 -0700 Subject: [PATCH] Make traefik aware of root domain and update makefile --- Makefile | 4 ++-- homepage/docker-compose.yml.blanked | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1bb0a7c..deb44fd 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ jenkins: cd jenkins && $(DOCKER_BUILD) minecraft: - cd minecraft && $(DOCKER_NETWORK_CREATE) grafana_grafana-network && $(DOCKER_COMPOSE_UP) + cd minecraft && $(DOCKER_COMPOSE_UP) monica: cd monica && $(DOCKER_BUILD) @@ -50,5 +50,5 @@ portainer: cd portainer && $(DOCKER_BUILD) traefik: - cd traefik && $(DOCKER_NETWORK_CREATE) traefik_traefik-network && $(DOCKER_COMPOSE_UP) + cd traefik && $(DOCKER_COMPOSE_UP) diff --git a/homepage/docker-compose.yml.blanked b/homepage/docker-compose.yml.blanked index 016c920..1cf2041 100644 --- a/homepage/docker-compose.yml.blanked +++ b/homepage/docker-compose.yml.blanked @@ -12,7 +12,7 @@ services: - [TRAEFIK_NETWORK] build: . labels: - - traefik.http.routers.homepage.rule=Host(`[SUBDOMAIN_URL]`) + - traefik.http.routers.homepage.rule=Host(`[DOMAIN_URL]` || `[SUBDOMAIN_URL]`) - traefik.http.routers.homepage.tls=true - traefik.http.routers.homepage.tls.certresolver=lets-encrypt - traefik.http.services.homepage.loadbalancer.server.port=[[NGINX_INTERNAL_PORT]]