Merge pull request #1818 from alphagov/update-spatial-sha-270824

Update spatial sha to fix ISO format date handling
alphagov · Aug 27, 2024 · 531001e · 531001e
2 parents 108293a + 934d93a
commit 531001e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
@@ -30,10 +30,10 @@ jobs:
         app:
           - name: ckan
             version: 2.10.4
-            patch: b
+            patch: c
           - name: pycsw
             version: 2.6.1
-            patch: i
+            patch: j
           - name: solr
             version: "2.10"
             patch: a

diff --git a/docker/ckan/2.10.4-base.Dockerfile b/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='c9c742a16295fc898b604b58de2e1bb4b3966d50'
+ENV ckan_spatial_sha='5840746380b194d84708181e73fcb904a66625f3'
 ENV ckan_spatial_fork='alphagov'
 
 RUN echo "pip install DGU extensions..." && \

diff --git a/docker/ckan/2.10.4.Dockerfile b/docker/ckan/2.10.4.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM ghcr.io/alphagov/ckan:2.10.4-b-base
+FROM --platform=$TARGETPLATFORM ghcr.io/alphagov/ckan:2.10.4-c-base
 
 USER root
 

diff --git a/docker/pycsw/2.6.1.Dockerfile b/docker/pycsw/2.6.1.Dockerfile
@@ -98,7 +98,7 @@ WORKDIR $CKAN_VENV/src
 USER ckan
 EXPOSE 5000
 
-ENV ckan_spatial_sha='c9c742a16295fc898b604b58de2e1bb4b3966d50'
+ENV ckan_spatial_sha='5840746380b194d84708181e73fcb904a66625f3'
 ENV ckan_spatial_fork='alphagov'
 
 ENV ckan_harvest_fork='ckan'