Merge remote-tracking branch 'origin/main' into new-module-indicator

DFE-Digital · Dec 5, 2023 · cd83ebc · cd83ebc
1 parent 22528c1
commit cd83ebc
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 504 deletions.
diff --git a/.github/workflows/azure-deploy-dev.yml b/.github/workflows/azure-deploy-dev.yml
@@ -105,6 +105,7 @@ jobs:
               --vnet ${{ secrets.AZURE_VNET }} \
               --subnet ${{ secrets.AZURE_WORKER_APP_SUBNET }} \
               --ip-address Private \
+              --output none \
               --environment-variables \
                 EDITOR=vi RAILS_ENV=production RAILS_LOG_TO_STDOUT=true \
                 GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} \

diff --git a/.github/workflows/azure-deploy-prod.yml b/.github/workflows/azure-deploy-prod.yml
@@ -103,14 +103,15 @@ jobs:
             az container create --resource-group ${{ secrets.AZURE_RESOURCE_GROUP }} \
               --name ${{ vars.WORKERAPP_NAME }} \
               --image ${{ env.DOCKER_IMAGE }}:${{ inputs.version || github.ref_name }} \
-              --cpu 1 \
+              --cpu 2 \
               --memory 2 \
               --command-line "que" \
               --restart-policy OnFailure \
               --log-analytics-workspace ${{ secrets.AZURE_LOG_ANALYTICS_WORKSPACE }} \
               --vnet ${{ secrets.AZURE_VNET }} \
               --subnet ${{ secrets.AZURE_WORKER_APP_SUBNET }} \
               --ip-address Private \
+              --output none \
               --environment-variables \
                 EDITOR=vi RAILS_ENV=production RAILS_LOG_TO_STDOUT=true \
                 GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} \

diff --git a/.github/workflows/azure-deploy-stage.yml b/.github/workflows/azure-deploy-stage.yml
@@ -103,14 +103,15 @@ jobs:
             az container create --resource-group ${{ secrets.AZURE_RESOURCE_GROUP }} \
               --name ${{ vars.WORKERAPP_NAME }} \
               --image ${{ env.DOCKER_IMAGE }}:${{ inputs.candidate || github.ref_name }} \
-              --cpu 1 \
+              --cpu 2 \
               --memory 2 \
               --command-line "que" \
               --restart-policy OnFailure \
               --log-analytics-workspace ${{ secrets.AZURE_LOG_ANALYTICS_WORKSPACE }} \
               --vnet ${{ secrets.AZURE_VNET }} \
               --subnet ${{ secrets.AZURE_WORKER_APP_SUBNET }} \
               --ip-address Private \
+              --output none \
               --environment-variables \
                 EDITOR=vi RAILS_ENV=production RAILS_LOG_TO_STDOUT=true \
                 GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} \

diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
@@ -67,4 +67,4 @@ jobs:
         name: Use Firefox
         env:
           BROWSER: standalone_firefox
-        run: bundle exec rspec --default-path ui
+        run: bundle exec rspec --default-path ui
diff --git a/terraform/app/locals.tf b/terraform/app/locals.tf
diff --git a/terraform/app/modules/paas/data.tf b/terraform/app/modules/paas/data.tf
diff --git a/terraform/app/modules/paas/inputs.tf b/terraform/app/modules/paas/inputs.tf
diff --git a/terraform/app/modules/paas/locals.tf b/terraform/app/modules/paas/locals.tf
diff --git a/terraform/app/modules/paas/main.tf b/terraform/app/modules/paas/main.tf
diff --git a/terraform/app/modules/paas/outputs.tf b/terraform/app/modules/paas/outputs.tf
diff --git a/terraform/app/terraform.tf b/terraform/app/terraform.tf