Added: swarm gateway labels and migrate state

capcom6 · Aug 3, 2023 · 20ea4ed · 20ea4ed
1 parent e0ff502
commit 20ea4ed
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git 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
@@ -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