Merge branch 'main' into update-helm-chart-703

ministryofjustice · Dec 2, 2024 · a882539 · a882539
2 parents 4491bcb + 046783e
commit a882539
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/opensearch-backup.yml b/.github/workflows/opensearch-backup.yml
@@ -16,6 +16,7 @@ on:
           - test
           - stage
           - preprod
+          - prod
 
 jobs:
   backup:
@@ -24,7 +25,7 @@ jobs:
 
     strategy:
       matrix:
-        environment: ${{ github.event_name == 'schedule' && fromJson('["poc," "dev", "test", "stage"]') || fromJson(format('["{0}"]', github.event.inputs.environment)) }}
+        environment: ${{ github.event_name == 'schedule' && fromJson('["poc", "dev", "test", "stage"]') || fromJson(format('["{0}"]', github.event.inputs.environment)) }}
 
     environment: ${{ matrix.environment }}-preapproved
 

diff --git a/tools/utils/Dockerfile b/tools/utils/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim
 
 # Install utils
-RUN apt-get update && apt-get install -y curl jq
+RUN apt-get update && apt-get install -y curl jq awscli
 
 # Create a non-root user and set the home directory
 RUN useradd -u 999 -ms /bin/bash job
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ on: @@
               - test
               - stage
               - preprod
+              - prod
     jobs:
       backup:
@@ Expand All / @@ -24,7 +25,7 @@ jobs: @@
         strategy:
           matrix:
-            environment: ${{ github.event_name == 'schedule' && fromJson('["poc," "dev", "test", "stage"]') || fromJson(format('["{0}"]', github.event.inputs.environment)) }}
+            environment: ${{ github.event_name == 'schedule' && fromJson('["poc", "dev", "test", "stage"]') || fromJson(format('["{0}"]', github.event.inputs.environment)) }}
         environment: ${{ matrix.environment }}-preapproved
@@ Expand Down @@