From cda2842f8faa9fc582af87fcef87cef9212fb8b2 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Wed, 3 Jan 2024 13:50:49 -0800
Subject: [PATCH] Switch to image containing stunnel

Rather than installing on container startup, using an image with
stunnel pre-installed. This avoids issues with DNS breaking
the container on startup.
---
 backups/backup.nomad                    | 13 ++-----------
 core/blocky/blocky.nomad                | 13 ++-----------
 core/grafana.nomad                      | 13 ++-----------
 databases/lldap.nomad                   | 13 ++-----------
 databases/mysql.nomad                   | 13 ++-----------
 databases/postgres.nomad                | 13 ++-----------
 databases/redis.nomad                   | 13 ++-----------
 services/service/service_template.nomad | 13 ++-----------
 8 files changed, 16 insertions(+), 88 deletions(-)

diff --git a/backups/backup.nomad b/backups/backup.nomad
index ac178c5..b25dcf2 100644
--- a/backups/backup.nomad
+++ b/backups/backup.nomad
@@ -173,8 +173,8 @@ job "Dummy" {
       }
 
       config {
-        image = "alpine:3.17"
-        args = ["/bin/sh", "$${NOMAD_TASK_DIR}/start.sh"]
+        image = "iamthefij/stunnel:latest"
+        args = ["$${NOMAD_TASK_DIR}/stunnel.conf"]
       }
 
       resources {
@@ -182,15 +182,6 @@ job "Dummy" {
         memory = 100
       }
 
-      template {
-        data = <<EOF
-set -e
-apk add stunnel
-exec stunnel {{ env "NOMAD_TASK_DIR" }}/stunnel.conf
-        EOF
-        destination = "$${NOMAD_TASK_DIR}/start.sh"
-      }
-
       template {
         data = <<EOF
 syslog = no
diff --git a/core/blocky/blocky.nomad b/core/blocky/blocky.nomad
index 4b9a4fb..26a8372 100644
--- a/core/blocky/blocky.nomad
+++ b/core/blocky/blocky.nomad
@@ -116,9 +116,9 @@ job "blocky" {
       }
 
       config {
-        image = "alpine:3.17"
+        image = "iamthefij/stunnel:latest"
+        args = ["$${NOMAD_TASK_DIR}/stunnel.conf"]
         ports = ["tls"]
-        args = ["/bin/sh", "$${NOMAD_TASK_DIR}/start.sh"]
       }
 
       resources {
@@ -126,15 +126,6 @@ job "blocky" {
         memory = 100
       }
 
-      template {
-        data = <<EOF
-set -e
-apk add stunnel
-exec stunnel {{ env "NOMAD_TASK_DIR" }}/stunnel.conf
-        EOF
-        destination = "$${NOMAD_TASK_DIR}/start.sh"
-      }
-
       template {
         data = <<EOF
 syslog = no
diff --git a/core/grafana.nomad b/core/grafana.nomad
index f190110..abd604b 100644
--- a/core/grafana.nomad
+++ b/core/grafana.nomad
@@ -40,8 +40,8 @@ job "grafana" {
       }
 
       config {
-        image = "alpine:3.17"
-        args = ["/bin/sh", "$${NOMAD_TASK_DIR}/start.sh"]
+        image = "iamthefij/stunnel:latest"
+        args = ["$${NOMAD_TASK_DIR}/stunnel.conf"]
       }
 
       resources {
@@ -49,15 +49,6 @@ job "grafana" {
         memory = 100
       }
 
-      template {
-        data = <<EOF
-set -e
-apk add stunnel
-exec stunnel {{ env "NOMAD_TASK_DIR" }}/stunnel.conf
-        EOF
-        destination = "$${NOMAD_TASK_DIR}/start.sh"
-      }
-
       template {
         data = <<EOF
 syslog = no
diff --git a/databases/lldap.nomad b/databases/lldap.nomad
index f06c260..434bff8 100644
--- a/databases/lldap.nomad
+++ b/databases/lldap.nomad
@@ -193,9 +193,9 @@ SELECT 'NOOP';
       }
 
       config {
-        image = "alpine:3.17"
+        image = "iamthefij/stunnel:latest"
+        args = ["$${NOMAD_TASK_DIR}/stunnel.conf"]
         ports = ["tls"]
-        args = ["/bin/sh", "$${NOMAD_TASK_DIR}/start.sh"]
       }
 
       resources {
@@ -203,15 +203,6 @@ SELECT 'NOOP';
         memory = 100
       }
 
-      template {
-        data = <<EOF
-set -e
-apk add stunnel
-exec stunnel {{ env "NOMAD_TASK_DIR" }}/stunnel.conf
-        EOF
-        destination = "$${NOMAD_TASK_DIR}/start.sh"
-      }
-
       template {
         data = <<EOF
 syslog = no
diff --git a/databases/mysql.nomad b/databases/mysql.nomad
index cf0838d..7d050b9 100644
--- a/databases/mysql.nomad
+++ b/databases/mysql.nomad
@@ -81,9 +81,9 @@ MYSQL_ROOT_PASSWORD={{ .mysql_root_password }}
       driver = "docker"
 
       config {
-        image = "alpine:3.17"
+        image = "iamthefij/stunnel:latest"
+        args = ["${NOMAD_TASK_DIR}/stunnel.conf"]
         ports = ["tls"]
-        args = ["/bin/sh", "${NOMAD_TASK_DIR}/start.sh"]
       }
 
       resources {
@@ -91,15 +91,6 @@ MYSQL_ROOT_PASSWORD={{ .mysql_root_password }}
         memory = 100
       }
 
-      template {
-        data = <<EOF
-set -e
-apk add stunnel
-exec stunnel ${NOMAD_TASK_DIR}/stunnel.conf
-        EOF
-        destination = "${NOMAD_TASK_DIR}/start.sh"
-      }
-
       template {
         data = <<EOF
 syslog = no
diff --git a/databases/postgres.nomad b/databases/postgres.nomad
index cab69fe..20b95b5 100644
--- a/databases/postgres.nomad
+++ b/databases/postgres.nomad
@@ -81,9 +81,9 @@ POSTGRES_PASSWORD={{ .superuser_pass }}
       driver = "docker"
 
       config {
-        image = "alpine:3.17"
+        image = "iamthefij/stunnel:latest"
+        args = ["${NOMAD_TASK_DIR}/stunnel.conf"]
         ports = ["tls"]
-        args = ["/bin/sh", "${NOMAD_TASK_DIR}/start.sh"]
       }
 
       resources {
@@ -91,15 +91,6 @@ POSTGRES_PASSWORD={{ .superuser_pass }}
         memory = 100
       }
 
-      template {
-        data = <<EOF
-set -e
-apk add stunnel
-exec stunnel ${NOMAD_TASK_DIR}/stunnel.conf
-        EOF
-        destination = "${NOMAD_TASK_DIR}/start.sh"
-      }
-
       template {
         data = <<EOF
 syslog = no
diff --git a/databases/redis.nomad b/databases/redis.nomad
index b8e3e67..82aaf63 100644
--- a/databases/redis.nomad
+++ b/databases/redis.nomad
@@ -44,9 +44,9 @@ job "redis-${name}" {
       driver = "docker"
 
       config {
-        image = "alpine:3.17"
+        image = "iamthefij/stunnel:latest"
+        args = ["$${NOMAD_TASK_DIR}/stunnel.conf"]
         ports = ["tls"]
-        args = ["/bin/sh", "$${NOMAD_TASK_DIR}/start.sh"]
       }
 
       resources {
@@ -54,15 +54,6 @@ job "redis-${name}" {
         memory = 100
       }
 
-      template {
-        data = <<EOF
-set -e
-apk add stunnel
-exec stunnel $${NOMAD_TASK_DIR}/stunnel.conf
-        EOF
-        destination = "$${NOMAD_TASK_DIR}/start.sh"
-      }
-
       template {
         data = <<EOF
 syslog = no
diff --git a/services/service/service_template.nomad b/services/service/service_template.nomad
index d2faa08..cd8b31f 100644
--- a/services/service/service_template.nomad
+++ b/services/service/service_template.nomad
@@ -354,8 +354,8 @@ $$;
       }
 
       config {
-        image = "alpine:3.17"
-        args = ["/bin/sh", "$${NOMAD_TASK_DIR}/start.sh"]
+        image = "iamthefij/stunnel:latest"
+        args = ["$${NOMAD_TASK_DIR}/stunnel.conf"]
       }
 
       resources {
@@ -366,15 +366,6 @@ $$;
         %{~ endif ~}
       }
 
-      template {
-        data = <<EOF
-set -e
-apk add stunnel
-exec stunnel {{ env "NOMAD_TASK_DIR" }}/stunnel.conf
-        EOF
-        destination = "$${NOMAD_TASK_DIR}/start.sh"
-      }
-
       template {
         data = <<EOF
 syslog = no