Merge pull request #1934 from alphagov/update-spatial-sha-cryptograph…

…y-42

Update spatial sha to use cryptography 42 in spatial extension

.github/workflows/create-pr.yaml

@@ -4,13 +4,16 @@ on:
   workflow_dispatch:
   workflow_run:
     workflows: [ "Build and push multi-arch image" ]
+    branches:
+      - main
     types:
       - completed
 
 jobs:
   create_pr:
     name: Create charts PR
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
     steps:
       - name: Checkout ckanext-datagovuk repository
         uses: actions/checkout@v3

build-config.yaml

@@ -2,11 +2,11 @@ apps:
   ckan: &app_ckan
     name: ckan
     version: "2.10.4"
-    patch: i
+    patch: j
   pycsw: &app_pycsw
     name: pycsw
     version: "2.6.1"
-    patch: n
+    patch: o
   solr: &app_solr
     name: solr
     version: "2.10"

docker/ckan/2.10.4-base.Dockerfile

@@ -14,7 +14,7 @@ ENV ckan_harvest_sha='9fb44f79809a1c04dfeb0e1ca2540c5ff3cacef4'
 ENV ckan_dcat_fork='ckan'
 ENV ckan_dcat_sha='618928be5a211babafc45103a72b6aab4642e964'
 
-ENV ckan_spatial_sha='0b14c5f8775003e8363ce9d347243d087e19c3cb'
+ENV ckan_spatial_sha='c4938431346b50209d7bcf89a1a0154698b9f9f2'
 ENV ckan_spatial_fork='alphagov'
 
 RUN echo "pip install DGU extensions..." && \

docker/ckan/2.10.4.Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/alphagov/ckan:2.10.4-i-base
+FROM ghcr.io/alphagov/ckan:2.10.4-j-base
 
 USER root
 

docker/pycsw/2.6.1.Dockerfile

@@ -98,7 +98,7 @@ WORKDIR $CKAN_VENV/src
 USER ckan
 EXPOSE 5000
 
-ENV ckan_spatial_sha='0b14c5f8775003e8363ce9d347243d087e19c3cb'
+ENV ckan_spatial_sha='c4938431346b50209d7bcf89a1a0154698b9f9f2'
 ENV ckan_spatial_fork='alphagov'
 
 ENV ckan_harvest_fork='ckan'