Merge pull request #1868 from alphagov/update-spatial-sha-stop-duplic…

…ates Update spatial sha stop duplicates
alphagov · Nov 6, 2024 · 23e594e · 23e594e
2 parents 8714d78 + daa11ad
commit 23e594e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 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: e
+    patch: f
   pycsw: &app_pycsw
     name: pycsw
     version: "2.6.1"
-    patch: k
+    patch: l
   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,4 +1,4 @@
-ARG BASE_IMAGE=ghcr.io/alphagov/ckan:2.10.4-e-core
+ARG BASE_IMAGE=ghcr.io/alphagov/ckan:2.10.4-f-core
 FROM --platform=$TARGETPLATFORM ${BASE_IMAGE}
 
 COPY production.ini $CKAN_CONFIG/production.ini
@@ -15,7 +15,7 @@ ENV ckan_harvest_sha='9fb44f79809a1c04dfeb0e1ca2540c5ff3cacef4'
 ENV ckan_dcat_fork='ckan'
 ENV ckan_dcat_sha='618928be5a211babafc45103a72b6aab4642e964'
 
-ENV ckan_spatial_sha='5840746380b194d84708181e73fcb904a66625f3'
+ENV ckan_spatial_sha='23f9e5d0d07fa411ffea56498167da6a2c9a7df6'
 ENV ckan_spatial_fork='alphagov'
 
 RUN echo "pip install DGU extensions..." && \

diff --git a/docker/ckan/2.10.4-core.Dockerfile b/docker/ckan/2.10.4-core.Dockerfile
@@ -1,5 +1,5 @@
 # See CKAN docs on installation from Docker Compose on usage
-FROM --platform=$TARGETPLATFORM ubuntu:jammy
+FROM ubuntu:jammy
 
 # Set timezone
 ENV TZ=UTC

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-e-base
+FROM ghcr.io/alphagov/ckan:2.10.4-f-base
 
 USER root
 

diff --git a/docker/pycsw/2.6.1.Dockerfile b/docker/pycsw/2.6.1.Dockerfile
@@ -1,5 +1,5 @@
 # See CKAN docs on installation from Docker Compose on usage
-FROM --platform=$TARGETPLATFORM ubuntu:jammy AS base
+FROM ubuntu:jammy AS base
 
 # Set timezone
 ENV TZ=UTC
@@ -44,9 +44,9 @@ RUN apt-get -q -y update \
     && rm -rf /var/lib/apt/lists/*
 
 # Define environment variables
-ENV CKAN_HOME /usr/lib/ckan
-ENV CKAN_VENV $CKAN_HOME/venv
-ENV CKAN_CONFIG /config
+ENV CKAN_HOME=/usr/lib/ckan
+ENV CKAN_VENV=$CKAN_HOME/venv
+ENV CKAN_CONFIG=/config
 ENV CKAN_STORAGE_PATH=/var/lib/ckan
 
 # Create ckan user
@@ -91,14 +91,14 @@ RUN pip install -U pip && \
     chmod +x /pycsw-entrypoint.sh && \
     chown -R ckan:ckan $CKAN_HOME $CKAN_VENV $CKAN_CONFIG $CKAN_STORAGE_PATH
 
-FROM --platform=$TARGETPLATFORM base AS prod
+FROM base AS prod
 
 WORKDIR $CKAN_VENV/src
 
 USER ckan
 EXPOSE 5000
 
-ENV ckan_spatial_sha='5840746380b194d84708181e73fcb904a66625f3'
+ENV ckan_spatial_sha='23f9e5d0d07fa411ffea56498167da6a2c9a7df6'
 ENV ckan_spatial_fork='alphagov'
 
 ENV ckan_harvest_fork='ckan'