Fixing nassella-in-production bugs.

src/Dockerfile

@@ -43,10 +43,17 @@ COPY run.scm run.scm
 RUN csc -O3 -o nassella-run run.scm
 RUN chmod +x nassella-run
 
+FROM quay.io/coreos/butane:release AS butane
+FROM hashicorp/terraform:1.15 AS terraform
+
 FROM debian:trixie-slim
 RUN apt-get update && apt-get -y --no-install-recommends install \
- libpq-dev ca-certificates gettext-base openssh-client restic \
+ libpq-dev ca-certificates gettext-base openssh-client restic make \
  && rm -rf /var/lib/apt/lists/*
+
+COPY --from=butane /usr/local/bin/butane /usr/local/bin/butane
+COPY --from=terraform /bin/terraform /usr/local/bin/terraform
+
 COPY --from=buildeggs /usr/local/ /usr/local/
 
 WORKDIR /var

src/nassella.scm

@@ -793,7 +793,9 @@ h1, h2, h3, h4, h5, h6 {
     (dev
      ;; in dev copy personal ssh key
      (copy-file "../config/ssh-keys" (string-append dir "/config/ssh-keys")))
-    (else '()))
+    (else
+     ;; in prod, no ssh-keys, but we need the file to exist for Make
+     (with-output-to-file (string-append dir "/config/ssh-keys") (lambda () (display "")))))
   (with-output-to-file (string-append dir "/terraform.tfstate") (lambda () (write-string state)))
   (with-output-to-file (string-append dir "/terraform.tfstate.backup") (lambda () (write-string state-backup))))
 
@@ -1577,6 +1579,7 @@ chmod -R 777 /opt/keys")))
              (restic-password (alist-ref 'restic-password results))
              (dir (deployment-directory (session-user-id) instance-id)))
         (setup-deploy-files dir (alist-ref 'state terraform-state) (alist-ref 'backup terraform-state))
+        (log-to (debug-log) "writing configs")
         (with-output-to-file (string-append dir "/config/apps.config")
           (lambda ()
             (map (lambda (e)
@@ -1653,7 +1656,7 @@ chmod -R 777 /opt/keys")))
                    ("cloudflare_api_token" . ,(alist-ref 'cloudflare-api-token service-config))
                    ("cloudflare_zone_id" . ,(alist-ref 'cloudflare-zone-id service-config))
                    ("cloudflare_account_id" . ,(alist-ref 'cloudflare-account-id service-config))
-                   ("cluster_name" . "nassella")
+                   ("cluster_name" . ,(string-append "nassella" (string-delete #\. root-domain))) ;; TODO update to: (import srfi-14) (string-filter char-set:letter+digit root-domain)
                    ("datacenter" . ,(alist-ref 'digitalocean-region service-config))
                    ;; (source <(curl -sSfL https://stable.release.flatcar-linux.net/amd64-usr/current/version.txt); echo "${FLATCAR_VERSION_ID}")
                    ("flatcar_stable_version" . "4593.2.4")))