Merge pull request #1896 from alphagov/add-user-agent-schema-resolver

Add user agent schema resolver spatial sha
alphagov · Dec 6, 2024 · 45208ef · 45208ef
2 parents 1e4eb42 + 9d246e1
commit 45208ef
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/build-config.yaml b/build-config.yaml
@@ -2,11 +2,11 @@ apps:
   ckan: &app_ckan
     name: ckan
     version: "2.10.4"
-    patch: h
+    patch: i
   pycsw: &app_pycsw
     name: pycsw
     version: "2.6.1"
-    patch: m
+    patch: n
   solr: &app_solr
     name: solr
     version: "2.10"

diff --git a/docker/ckan/2.10.4-base.Dockerfile b/docker/ckan/2.10.4-base.Dockerfile
@@ -1,5 +1,4 @@
-ARG BASE_IMAGE=ghcr.io/alphagov/ckan:2.10.4-g-core
-FROM --platform=$TARGETPLATFORM ${BASE_IMAGE}
+FROM ghcr.io/alphagov/ckan:2.10.4-i-core
 
 COPY production.ini $CKAN_CONFIG/production.ini
 # Set CKAN_INI
@@ -15,7 +14,7 @@ ENV ckan_harvest_sha='9fb44f79809a1c04dfeb0e1ca2540c5ff3cacef4'
 ENV ckan_dcat_fork='ckan'
 ENV ckan_dcat_sha='618928be5a211babafc45103a72b6aab4642e964'
 
-ENV ckan_spatial_sha='1eded8ad2236b3d885e56f9c39ffab52294fd4d0'
+ENV ckan_spatial_sha='0b14c5f8775003e8363ce9d347243d087e19c3cb'
 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 ghcr.io/alphagov/ckan:2.10.4-g-base
+FROM ghcr.io/alphagov/ckan:2.10.4-i-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='1eded8ad2236b3d885e56f9c39ffab52294fd4d0'
+ENV ckan_spatial_sha='0b14c5f8775003e8363ce9d347243d087e19c3cb'
 ENV ckan_spatial_fork='alphagov'
 
 ENV ckan_harvest_fork='ckan'