Merge branch 'main' into one-login

DFE-Digital · Nov 6, 2023 · 42eae8a · 42eae8a
2 parents 04a8a15 + ea80f70
commit 42eae8a
Show file tree

Hide file tree

Showing 22 changed files with 261 additions and 363 deletions.
diff --git a/.docker-profile b/.docker-profile
diff --git a/.github/workflows/content.yml b/.github/workflows/content.yml
@@ -9,25 +9,25 @@
 #   https://ey-recovery-pr-123.london.cloudapps.digital
 #
 name: Deploy Content App
-on:
-  pull_request:
-    # branches:
-    #   - main
-    types:
-      - labeled
-      - synchronize
-    paths-ignore:
-      - '**/*.md'
-      - .docker*
-      - .env.example
-      - .gitignore
-      - .pa11yci
-      - .tool-versions
-      - .yardopts
-      - bin/*
-      - docker-compose.*
-      - Dockerfile
-      - terraform
+# on:
+#   pull_request:
+#     # branches:
+#     #   - main
+#     types:
+#       - labeled
+#       - synchronize
+#     paths-ignore:
+#       - '**/*.md'
+#       - .docker*
+#       - .env.example
+#       - .gitignore
+#       - .pa11yci
+#       - .tool-versions
+#       - .yardopts
+#       - bin/*
+#       - docker-compose.*
+#       - Dockerfile
+#       - terraform
 
 jobs:
   deploy:
@@ -48,7 +48,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       -
         name: Pin Terraform version
-        uses: hashicorp/setup-terraform@v2.0.3
+        uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 1.1.7
       -

diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -7,22 +7,22 @@
 #   https://ey-recovery-dev.london.cloudapps.digital
 #
 name: Deploy Development App
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - '**/*.md'
-      - .docker*
-      - .env.example
-      - .gitignore
-      - .pa11yci
-      - .tool-versions
-      - .yardopts
-      - bin/*
-      - docker-compose.*
-      - uml/*
+# on:
+#   workflow_dispatch:
+#   push:
+#     branches:
+#       - main
+#     paths-ignore:
+#       - '**/*.md'
+#       - .docker*
+#       - .env.example
+#       - .gitignore
+#       - .pa11yci
+#       - .tool-versions
+#       - .yardopts
+#       - bin/*
+#       - docker-compose.*
+#       - uml/*
 
 jobs:
   deploy:
@@ -39,7 +39,7 @@ jobs:
         #   ref: ${{ github.sha }}
       -
         name: Pin Terraform version
-        uses: hashicorp/setup-terraform@v2.0.3
+        uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 1.1.7
       -

diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -47,7 +47,7 @@ jobs:
           echo "HEAD=$(git rev-parse ${{ inputs.version }})" >> $GITHUB_ENV
       -
         name: Pin Terraform version
-        uses: hashicorp/setup-terraform@v2.0.3
+        uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 1.1.7
       -

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -10,21 +10,21 @@
 #   https://ey-recovery-staging.london.cloudapps.digital
 #
 name: Deploy Staging App
-on:
-  workflow_dispatch:
-    inputs:
-      candidate:
-        description: Create release candidate version ("rcx.x.x")
-        type: string
-        required: true
-      ref:
-        description: Git ref or branch to deploy
-        type: string
-        required: true
-        default: main
-  push:
-    tags:
-      - rc*
+# on:
+#   workflow_dispatch:
+#     inputs:
+#       candidate:
+#         description: Create release candidate version ("rcx.x.x")
+#         type: string
+#         required: true
+#       ref:
+#         description: Git ref or branch to deploy
+#         type: string
+#         required: true
+#         default: main
+#   push:
+#     tags:
+#       - rc*
 
 jobs:
   deploy:
@@ -48,7 +48,7 @@ jobs:
           echo "HEAD=$(git rev-parse ${{ inputs.candidate }})" >> $GITHUB_ENV
       -
         name: Pin Terraform version
-        uses: hashicorp/setup-terraform@v2.0.3
+        uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 1.1.7
       -

diff --git a/.github/workflows/teardown.yml b/.github/workflows/teardown.yml
@@ -22,7 +22,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       -
         name: Pin Terraform version
-        uses: hashicorp/setup-terraform@v2.0.3
+        uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 1.1.7
       -

diff --git a/.github/workflows/tf-azure-deploy.yml b/.github/workflows/tf-azure-deploy.yml
@@ -45,7 +45,7 @@ jobs:
 
       # Install the latest version of the Terraform CLI
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 1.5.6
           terraform_wrapper: false
@@ -148,7 +148,7 @@ jobs:
 
       # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 1.5.6
 

diff --git a/.github/workflows/tf-azure-unit-tests.yml b/.github/workflows/tf-azure-unit-tests.yml
@@ -24,7 +24,7 @@ jobs:
 
     # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token
     - name: Setup Terraform
-      uses: hashicorp/setup-terraform@v2
+      uses: hashicorp/setup-terraform@v3
 
     # Initialise a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc.
     - name: Terraform Init

diff --git a/Dockerfile b/Dockerfile
@@ -53,8 +53,6 @@ ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium-browser
 ENV APP_HOME /srv
 ENV RAILS_ENV ${RAILS_ENV:-production}
 
-COPY .docker-profile /root/.profile
-
 RUN mkdir -p ${APP_HOME}/tmp/pids ${APP_HOME}/log
 
 WORKDIR ${APP_HOME}

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -114,6 +114,12 @@ pre.code-tip {
   font-weight: normal;
 }
 
+.govuk-fieldset__legend {
+  @include govuk-media-query($until: tablet) {
+    display: none;
+  }
+}
+
 .light-grey-box {
   padding: govuk-spacing(5);
   margin-bottom: govuk-spacing(5);