From 6bc4be8068a19b1e80c6db66e548fa62919bfe07 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Fri, 14 Feb 2025 21:31:04 +0100
Subject: [PATCH] Housekeeping
---
products/traefik/hello.tf | 3 ++-
products/traefik/traefik.tf | 9 +++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/products/traefik/hello.tf b/products/traefik/hello.tf
index d8e372c..56e6da5 100644
--- a/products/traefik/hello.tf
+++ b/products/traefik/hello.tf
@@ -1,4 +1,5 @@
module "traefik_hello" {
+ depends_on = [module.traefik]
count = var.hello_service_domain != null ? 1 : 0
source = "../../docker/service"
stack_name = var.stack_name
@@ -6,7 +7,7 @@ module "traefik_hello" {
image = "nginxdemos/hello:plain-text"
parallelism = 3
placement_constraints = var.placement_constraints
- networks = [module.traefik_network, ]
+ networks = [module.network, ]
traefik = {
domain = var.hello_service_domain
port = 80
diff --git a/products/traefik/traefik.tf b/products/traefik/traefik.tf
index 6ca42f1..c255e68 100644
--- a/products/traefik/traefik.tf
+++ b/products/traefik/traefik.tf
@@ -40,7 +40,7 @@ locals {
var.enable_docker_provider ? [
"--providers.docker=true",
"--providers.docker.exposedByDefault=false",
- "--providers.docker.network=${module.traefik_network.name}",
+ "--providers.docker.network=${module.network.name}",
"--providers.docker.endpoint=http://${module.docker_socket_proxy.docker_service.name}:2375",
] : [
"--providers.docker=false"
@@ -50,7 +50,7 @@ locals {
var.enable_swarm_provider ? [
"--providers.swarm=true",
"--providers.swarm.exposedByDefault=false",
- "--providers.swarm.network=${module.traefik_network.name}",
+ "--providers.swarm.network=${module.network.name}",
"--providers.swarm.endpoint=http://${module.docker_socket_proxy.docker_service.name}:2375",
] : [
"--providers.swarm=false"
@@ -88,16 +88,17 @@ locals {
}
module "traefik" {
source = "../../docker/service"
- depends_on = [module.docker_socket_proxy]
+ depends_on = [module.docker_socket_proxy, module.network, ]
stack_name = var.stack_name
service_name = "traefik"
image = var.traefik_image
- networks = [module.traefik_network, module.docker_socket_proxy.network, ]
+ networks = [module.network, module.docker_socket_proxy.network, ]
remote_volumes = { "/certs" = module.traefik_certs_volume.volume }
placement_constraints = var.placement_constraints
global = true
converge_enable = false // @todo add healthcheck
command = local.command
+
traefik = var.traefik_dashboard_service_domain != null ? {
domain = var.traefik_dashboard_service_domain
port = var.dashboard_port