Merge pull request #1905 from alphagov/dj-maisy/solr-2.10-c

Bump Solr to 2.10-c for ARM flavour
alphagov · Dec 19, 2024 · eacb786 · eacb786
2 parents 45208ef + 71211e9
commit eacb786
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
       options: --user root
     services:
       solr:
-        image: ghcr.io/alphagov/solr:2.10-b
+        image: ghcr.io/alphagov/solr:2.10-c
       postgres:
         image: postgis/postgis:13-3.1-alpine
         env:

diff --git a/build-config.yaml b/build-config.yaml
@@ -10,7 +10,7 @@ apps:
   solr: &app_solr
     name: solr
     version: "2.10"
-    patch: b
+    patch: c
 
 build_types:
   build_only:

diff --git a/docker/solr/2.10.Dockerfile b/docker/solr/2.10.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM solr:8
+FROM solr:8
 
 EXPOSE 8983
 
@@ -27,7 +27,7 @@ RUN chmod 644 $JTS_JAR_FILE
 # Add the spatial field type definitions and fields
 
 ## RPT
-ENV SOLR_RPT_FIELD_DEFINITION '<fieldType name="location_rpt"   class="solr.SpatialRecursivePrefixTreeFieldType" \
+ENV SOLR_RPT_FIELD_DEFINITION='<fieldType name="location_rpt"   class="solr.SpatialRecursivePrefixTreeFieldType" \
     spatialContextFactory="JTS"     \
     autoIndex="true"                \
     validationRule="repairBuffer0"  \