Merge branch 'main' into migrate-from-gcr-to-gar

ONSdigital · Aug 8, 2024 · 9ee6794 · 9ee6794
2 parents 5c19101 + 8d23f0c
commit 9ee6794
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -92,10 +92,28 @@ jobs:
         run: |
           git fetch --tags
           echo "tag=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+      - name: Import BOT GPG key
+        run: echo $BOT_GPG_KEY | base64 --decode | gpg --batch --import
+        env:
+          BOT_GPG_KEY: ${{ secrets.BOT_GPG_KEY }}
+      - name: Prepare gpg CLI signing step
+        run: |
+          rm -rf /tmp/gpg.sh
+          echo '#!/bin/bash' >> /tmp/gpg.sh
+          echo 'gpg --batch --pinentry-mode=loopback --passphrase $BOT_GPG_KEY_PASSPHRASE $@' >> /tmp/gpg.sh
+          chmod +x /tmp/gpg.sh
+      - name: Setup git
+        run: |
+          git config commit.gpgsign true
+          git config user.signingkey "${{ secrets.BOT_GPG_KEY_ID }}"
+          git config gpg.program /tmp/gpg.sh
+          git config user.name "${{ secrets.BOT_USERNAME }}"
+          git config user.email "${{ secrets.BOT_EMAIL }}"
       - name: update versions
         if: github.ref != 'refs/heads/main'
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+          BOT_GPG_KEY_PASSPHRASE: ${{ secrets.BOT_GPG_KEY_PASSPHRASE }}
           COMMIT_MSG: |
             auto patch increment
         shell: bash

diff --git a/Dockerfile b/Dockerfile
diff --git a/_infra/helm/response-operations-ui/Chart.yaml b/_infra/helm/response-operations-ui/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version
-version: 3.1.81
+version: 3.1.82
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 3.1.81
+appVersion: 3.1.82
diff --git a/response_operations_ui/__init__.py b/response_operations_ui/__init__.py
@@ -21,7 +21,7 @@
 CSP_POLICY = {
     "default-src": ["'self'", "https://cdn.ons.gov.uk"],
     "font-src": ["'self'", "data:", "https://fonts.gstatic.com", "https://cdn.ons.gov.uk"],
-    "script-src": ["'self'", "https://www.googletagmanager.com", "https://cdn.ons.gov.uk", "https://code.jquery.com"],
+    "script-src": ["'self'", "https://www.googletagmanager.com", "https://cdn.ons.gov.uk"],
     "connect-src": [
         "'self'",
         "https://www.googletagmanager.com",

diff --git a/response_operations_ui/templates/layouts/base.html b/response_operations_ui/templates/layouts/base.html
@@ -1,7 +1,6 @@
 {% extends "layout/_template.njk" %}
 {% block head %}
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/main.css') }}"/>
-    <script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/main.min.js') }}"></script>
     {% if config.GOOGLE_TAG_MANAGER %}
         <!-- Google Tag Manager -->