Housekeeping

This commit is contained in:
Greyscale 2025-02-14 21:31:04 +01:00
parent 641e76cf9d
commit 6bc4be8068
Signed by: grey
GPG key ID: DDB392AE64B32D89
2 changed files with 7 additions and 5 deletions
products/traefik

View file

@ -1,4 +1,5 @@
module "traefik_hello" { module "traefik_hello" {
depends_on = [module.traefik]
count = var.hello_service_domain != null ? 1 : 0 count = var.hello_service_domain != null ? 1 : 0
source = "../../docker/service" source = "../../docker/service"
stack_name = var.stack_name stack_name = var.stack_name
@ -6,7 +7,7 @@ module "traefik_hello" {
image = "nginxdemos/hello:plain-text" image = "nginxdemos/hello:plain-text"
parallelism = 3 parallelism = 3
placement_constraints = var.placement_constraints placement_constraints = var.placement_constraints
networks = [module.traefik_network, ] networks = [module.network, ]
traefik = { traefik = {
domain = var.hello_service_domain domain = var.hello_service_domain
port = 80 port = 80

View file

@ -40,7 +40,7 @@ locals {
var.enable_docker_provider ? [ var.enable_docker_provider ? [
"--providers.docker=true", "--providers.docker=true",
"--providers.docker.exposedByDefault=false", "--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.endpoint=http://${module.docker_socket_proxy.docker_service.name}:2375",
] : [ ] : [
"--providers.docker=false" "--providers.docker=false"
@ -50,7 +50,7 @@ locals {
var.enable_swarm_provider ? [ var.enable_swarm_provider ? [
"--providers.swarm=true", "--providers.swarm=true",
"--providers.swarm.exposedByDefault=false", "--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.endpoint=http://${module.docker_socket_proxy.docker_service.name}:2375",
] : [ ] : [
"--providers.swarm=false" "--providers.swarm=false"
@ -88,16 +88,17 @@ locals {
} }
module "traefik" { module "traefik" {
source = "../../docker/service" source = "../../docker/service"
depends_on = [module.docker_socket_proxy] depends_on = [module.docker_socket_proxy, module.network, ]
stack_name = var.stack_name stack_name = var.stack_name
service_name = "traefik" service_name = "traefik"
image = var.traefik_image 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 } remote_volumes = { "/certs" = module.traefik_certs_volume.volume }
placement_constraints = var.placement_constraints placement_constraints = var.placement_constraints
global = true global = true
converge_enable = false // @todo add healthcheck converge_enable = false // @todo add healthcheck
command = local.command command = local.command
traefik = var.traefik_dashboard_service_domain != null ? { traefik = var.traefik_dashboard_service_domain != null ? {
domain = var.traefik_dashboard_service_domain domain = var.traefik_dashboard_service_domain
port = var.dashboard_port port = var.dashboard_port