Mailer jobs which use root_url helpers require DOMAIN to function (#1161

)
DFE-Digital · May 1, 2024 · 9597357 · 9597357
1 parent 913440a
commit 9597357
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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 }}