refactor: standartize task naming

darklab8 · Jan 13, 2025 · dd704c6 · dd704c6
1 parent 56bb870
commit dd704c6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/docker-production.yml b/.github/workflows/docker-production.yml
@@ -49,6 +49,6 @@ jobs:
         set -ex
         docker pull darkwind8/darkstat:production
         sleep 5
-        docker service update --image darkwind8/darkstat:production darkstat-production
+        docker service update --image darkwind8/darkstat:production production-darkstat-web
 env:
   DOCKER_HOST: ssh://root@darkbot
diff --git a/.github/workflows/docker-staging.yml b/.github/workflows/docker-staging.yml
@@ -45,6 +45,6 @@ jobs:
         set -ex
         docker pull darkwind8/darkstat:staging
         sleep 5
-        docker service update --image darkwind8/darkstat:staging darkstat-staging
+        docker service update --image darkwind8/darkstat:staging staging-darkstat-web
 env:
   DOCKER_HOST: ssh://root@darkbot
diff --git a/kcls/build.k b/kcls/build.k
@@ -14,11 +14,13 @@ _workflows = [
         image_name = _image_name
         service_name = "darkstat"
         environment = "staging"
+        task_name = "web"
     })
     workflow.DockerDeploySwarm(workflow.DockerDeploySwarmOpts {
         image_name = _image_name
         service_name = "darkstat"
         environment = "production"
+        task_name = "web"
     })
 ]
 

diff --git a/tf/modules/darkstat/cron.tf b/tf/modules/darkstat/cron.tf
@@ -6,7 +6,7 @@ locals {
 }
 // ensures to catch new Discovery version
 resource "docker_container" "cron_restart" {
-  name    = "darkstat-cron-restart-${var.environment}"
+  name    = "${var.environment}-darkstat-cron-restart"
   image   = docker_image.docker_cli.image_id
   restart = "always"
   tty     = true

diff --git a/tf/modules/darkstat/main.tf b/tf/modules/darkstat/main.tf
@@ -14,7 +14,7 @@ data "docker_network" "caddy" {
 }
 
 resource "docker_service" "darkstat" {
-  name = "darkstat-${var.environment}"
+  name = "${var.environment}-darkstat-web"
 
   task_spec {
     networks_advanced {