Request consul in prestart hook

femiwiki · Oct 4, 2024 · 9087d8e · 9087d8e
1 parent 37aacb0
commit 9087d8e
Showing 1 changed file with 25 additions and 13 deletions.
diff --git a/jobs/fastcgi.nomad b/jobs/fastcgi.nomad
@@ -30,18 +30,23 @@ job "fastcgi" {
         sidecar = false
       }
 
-      driver = "exec"
+      driver = "docker"
       config {
-        command = "sh"
+        image        = "busybox:1.28"
+        command      = "sh"
+        network_mode = "host"
         args = [
           "-c",
-          format(
-            "while ! ncat --send-only %s %s < /dev/null; do sleep 1; done",
-            local.main ? "127.0.0.1" : NOMAD_UPSTREAM_IP_mysql,
-            local.main ? "3306" : NOMAD_UPSTREAM_PORT_mysql
-          ),
+          local.main ? "while ! ncat --send-only 127.0.0.1 3306 < /dev/null; do sleep 1; done"
+          : true ? "echo -n 'Waiting for service'; until -z ${var.main_nomad_addr} 3306 < /dev/null; do echo '.'; sleep 2; done"
+          : "echo -n 'Waiting for service'; until nslookup mysql.service.consul 127.0.0.1:8600 2>&1 >/dev/null; do echo '.'; sleep 2; done",
         ]
       }
+
+      resources {
+        cpu    = 100
+        memory = 100
+      }
     }
 
     task "wait-for-memcached" {
@@ -50,17 +55,24 @@ job "fastcgi" {
         sidecar = false
       }
 
-      driver = "exec"
+      driver = "docker"
       config {
-        command = "sh"
+        image        = "busybox:1.28"
+        command      = "sh"
+        network_mode = "host"
         args = [
           "-c",
-          format("while ! ncat --send-only %s %s < /dev/null; do sleep 1; done",
-            local.main ? "127.0.0.1" : NOMAD_UPSTREAM_IP_memcached,
-            local.main ? "11211" : NOMAD_UPSTREAM_PORT_memcached
-          ),
+          local.main ? format("while ! ncat --send-only %s %s < /dev/null; do sleep 1; done",
+            "127.0.0.1",
+            "11211"
+          ) : "echo -n 'Waiting for service'; until nslookup memcached.service.consul 127.0.0.1:8600 2>&1 >/dev/null; do echo '.'; sleep 2; done",
         ]
       }
+
+      resources {
+        cpu    = 100
+        memory = 100
+      }
     }
 
     task "fastcgi" {