From 20ea4eda3091b20bcaffed5a8d7b53cb4905dbd6 Mon Sep 17 00:00:00 2001 From: Aleksandr Soloshenko Date: Thu, 3 Aug 2023 23:37:30 +0700 Subject: [PATCH] Added: swarm gateway labels and migrate state --- deployments/docker-swarm-terraform/backend.tf | 4 ++-- deployments/docker-swarm-terraform/main.tf | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/deployments/docker-swarm-terraform/backend.tf b/deployments/docker-swarm-terraform/backend.tf index 52d1b8e..38f7091 100644 --- a/deployments/docker-swarm-terraform/backend.tf +++ b/deployments/docker-swarm-terraform/backend.tf @@ -1,7 +1,7 @@ terraform { backend "s3" { - bucket = "cq55609-bread" - key = "terraform/terraform.tfstate" + bucket = "38e04e71-private" + key = "terraform/django-bread.tfstate" region = "ru-1" endpoint = "s3.timeweb.com" diff --git a/deployments/docker-swarm-terraform/main.tf b/deployments/docker-swarm-terraform/main.tf index 1ea179f..fe568ca 100644 --- a/deployments/docker-swarm-terraform/main.tf +++ b/deployments/docker-swarm-terraform/main.tf @@ -28,7 +28,7 @@ resource "docker_service" "app" { task_spec { container_spec { - image = docker_image.app.image_id + image = docker_image.app.name env = { WEBSITE_HOSTNAME = var.app-host @@ -49,7 +49,7 @@ resource "docker_service" "app" { resources { limits { - nano_cpus = var.cpu-limit + # nano_cpus = var.cpu-limit memory_bytes = var.memory-limit } @@ -60,6 +60,21 @@ resource "docker_service" "app" { } } + # Swarm Gateway support + labels { + label = "gateway.enabled" + value = true + } + labels { + label = "gateway.server.host" + value = var.app-host + } + labels { + label = "gateway.server.port" + value = 8000 + } + + # Traefik support labels { label = "traefik.enable" value = true