Merge pull request #1811 from alphagov/update-spatial-sha-160824

Update spatial sha to fix metadata date check
alphagov · Aug 16, 2024 · 108293a · 108293a
2 parents f266bfd + 42ab9a2
commit 108293a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 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: a
+            patch: b
           - name: pycsw
             version: 2.6.1
-            patch: h
+            patch: i
           - 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
@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM ghcr.io/alphagov/ckan:2.10.4-a-core
+FROM --platform=$TARGETPLATFORM ghcr.io/alphagov/ckan:2.10.4-b-core
 
 COPY production.ini $CKAN_CONFIG/production.ini
 # Set CKAN_INI
@@ -14,7 +14,7 @@ ENV ckan_harvest_sha='9fb44f79809a1c04dfeb0e1ca2540c5ff3cacef4'
 ENV ckan_dcat_fork='ckan'
 ENV ckan_dcat_sha='618928be5a211babafc45103a72b6aab4642e964'
 
-ENV ckan_spatial_sha='bc345f92b55b44b75c1d44050dd988eab46e0b21'
+ENV ckan_spatial_sha='c9c742a16295fc898b604b58de2e1bb4b3966d50'
 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-a-base
+FROM --platform=$TARGETPLATFORM ghcr.io/alphagov/ckan:2.10.4-b-base
 
 USER root
 

diff --git a/docker/postgis/Dockerfile b/docker/postgis/Dockerfile
@@ -0,0 +1,15 @@
+FROM postgis/postgis:13-3.1-alpine
+
+# Allow connections; we don't map out any ports so only linked docker containers can connect
+RUN echo "host all  all    0.0.0.0/0  md5" >> /var/lib/postgresql/data/pg_hba.conf
+
+# Customize default user/pass/db
+ENV POSTGRES_DB ckan
+ENV POSTGRES_USER ckan
+ARG POSTGRES_PASSWORD
+ARG DATASTORE_READONLY_PASSWORD
+
+RUN rm -rf /var/lib/postgresql/data
+
+# Include extra setup scripts (eg datastore)
+ADD docker/postgis/docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
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='bc345f92b55b44b75c1d44050dd988eab46e0b21'
+ENV ckan_spatial_sha='c9c742a16295fc898b604b58de2e1bb4b3966d50'
 ENV ckan_spatial_fork='alphagov'
 
 ENV ckan_harvest_fork='ckan'