Fix/reindex

docker-compose-dev.yml

@@ -67,14 +67,10 @@ services:
 
   solr:
     container_name: solr
-    image: ckan/ckan-solr:2.10-solr8
+    build:
+      context: solr/
     volumes:
       - solr_data:/var/solr
-      - ./solr/schema.xml:${SOLR_CONFIG_CKAN_DIR}/managed-schema.xml
-      - ./solr/solrconfig.xml:${SOLR_CONFIG_CKAN_DIR}/solrconfig.xml
-
-      # - ./solr/schema.xml:/opt/solr/server/solr/configsets/ckan/conf/managed-schema
-
     ports:
       - "8983:8983"
     networks:
@@ -99,10 +95,7 @@ services:
         - DATAPUSHER_SQLALCHEMY_DATABASE_URI=${DATAPUSHER_SQLALCHEMY_DATABASE_URI}
     ports:
       - "8800:8800"
-    networks:
-      main:
-        aliases:
-          - solr
+
 volumes:
   ckan_storage:
   pg_data_510:

solr/Dockerfile

@@ -1,31 +1,21 @@
-ARG REGISTRY=''
-FROM ${REGISTRY}solr:6.2-alpine
-MAINTAINER Open Knowledge
+FROM solr:8
 
-#
-# Enviroment
-ENV SOLR_CORE ckan
-ENV CKAN_VERSION v2.9
+EXPOSE 8983
+
+ARG CKAN_BRANCH="dev-v2.10"
+
+ENV SOLR_CONFIG_DIR="/opt/solr/server/solr/configsets"
+ENV SOLR_SCHEMA_FILE="$SOLR_CONFIG_DIR/ckan/conf/managed-schema"
 
-# User
 USER root
 
-# Create Directories
-RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/conf
-RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/data
-
-# Adding Files
-ADD solrconfig.xml \
-schema.xml \
-https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/currency.xml \
-https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \
-https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \
-https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/protwords.txt \
-https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml \
-/opt/solr/server/solr/$SOLR_CORE/conf/
-
-# Create Core.properties
-RUN echo name=$SOLR_CORE > /opt/solr/server/solr/$SOLR_CORE/core.properties
-
-# Giving ownership to Solr
-RUN chown -R $SOLR_USER:$SOLR_USER /opt/solr/server/solr/$SOLR_CORE
+# Create a CKAN configset by copying the default one
+RUN cp -R $SOLR_CONFIG_DIR/_default $SOLR_CONFIG_DIR/ckan
+
+# Update the schema
+ADD https://raw.githubusercontent.com/rodekruis/510-data-catalog/develop/solr/schema.xml $SOLR_SCHEMA_FILE
+RUN chmod 644 $SOLR_SCHEMA_FILE
+
+USER solr
+
+CMD ["sh", "-c", "solr-precreate ckan $SOLR_CONFIG_DIR/ckan"]