From 9597357caf2e6f3e8f408e8f574619b3af71020a Mon Sep 17 00:00:00 2001
From: Peter Hamilton <pete@peterdavidhamilton.com>
Date: Wed, 1 May 2024 16:01:46 +0100
Subject: [PATCH] Mailer jobs which use root_url helpers require DOMAIN to
 function (#1161)

---
 .github/workflows/azure-deploy-dev.yml   | 9 +++++++--
 .github/workflows/azure-deploy-prod.yml  | 9 +++++++--
 .github/workflows/azure-deploy-stage.yml | 9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/azure-deploy-dev.yml b/.github/workflows/azure-deploy-dev.yml
index e17ab923b..b5e5f1fa8 100644
--- a/.github/workflows/azure-deploy-dev.yml
+++ b/.github/workflows/azure-deploy-dev.yml
@@ -118,6 +118,11 @@ jobs:
               --ip-address Private \
               --output none \
               --environment-variables \
-                EDITOR=vi RAILS_ENV=production RAILS_LOG_TO_STDOUT=true \
+                EDITOR=vi \
+                RAILS_ENV=production \
+                RAILS_LOG_TO_STDOUT=true \
+                DOMAIN=${{ vars.WEBAPP_CONFIG_DOMAIN }} \
                 GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} \
-                RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }} GCS_CREDENTIALS=${{ secrets.GCS_CREDENTIALS }}
+                RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} \
+                DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }} \
+                GCS_CREDENTIALS=${{ secrets.GCS_CREDENTIALS }}
diff --git a/.github/workflows/azure-deploy-prod.yml b/.github/workflows/azure-deploy-prod.yml
index 69014db24..230635101 100644
--- a/.github/workflows/azure-deploy-prod.yml
+++ b/.github/workflows/azure-deploy-prod.yml
@@ -120,6 +120,11 @@ jobs:
               --ip-address Private \
               --output none \
               --environment-variables \
-                EDITOR=vi RAILS_ENV=production RAILS_LOG_TO_STDOUT=true \
+                EDITOR=vi \
+                RAILS_ENV=production \
+                RAILS_LOG_TO_STDOUT=true \
+                DOMAIN=${{ vars.WEBAPP_CONFIG_DOMAIN }} \
                 GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} \
-                RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }} GCS_CREDENTIALS=${{ secrets.GCS_CREDENTIALS }}
+                RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} \
+                DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }} \
+                GCS_CREDENTIALS=${{ secrets.GCS_CREDENTIALS }}
diff --git a/.github/workflows/azure-deploy-stage.yml b/.github/workflows/azure-deploy-stage.yml
index 882c7252c..a756b6890 100644
--- a/.github/workflows/azure-deploy-stage.yml
+++ b/.github/workflows/azure-deploy-stage.yml
@@ -120,6 +120,11 @@ jobs:
               --ip-address Private \
               --output none \
               --environment-variables \
-                EDITOR=vi RAILS_ENV=production RAILS_LOG_TO_STDOUT=true \
+                EDITOR=vi \
+                RAILS_ENV=production \
+                RAILS_LOG_TO_STDOUT=true \
+                DOMAIN=${{ vars.WEBAPP_CONFIG_DOMAIN }} \
                 GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} \
-                RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }} GCS_CREDENTIALS=${{ secrets.GCS_CREDENTIALS }}
+                RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} \
+                DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }} \
+                GCS_CREDENTIALS=${{ secrets.GCS_CREDENTIALS }}