From c729b06cdb2a8632460789f38fa14760c986b1d0 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 10 Dec 2021 11:43:04 +0100 Subject: [PATCH] Update solr --- solr/Dockerfile | 18 +++++++++--------- solr/{solrconfig.xml => solrconfig-2.9.4.xml} | 0 2 files changed, 9 insertions(+), 9 deletions(-) rename solr/{solrconfig.xml => solrconfig-2.9.4.xml} (100%) diff --git a/solr/Dockerfile b/solr/Dockerfile index 8922342..feeb423 100755 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -3,7 +3,7 @@ FROM solr:6.6.6 # Enviroment variables ENV SOLR_CORE ckan ENV SOLR_VERSION 6.6.6 -ENV CKAN_VERSION 2.9.1 +ENV CKAN_VERSION 2.9.4 ###TODO!!! CKAN_VERSION to be passed in as an ARG # root user for initial config @@ -15,14 +15,14 @@ RUN mkdir -p /opt/solr/server/solr/${SOLR_CORE}/conf && \ mkdir -p /opt/solr/server/solr/${SOLR_CORE}/data/index # Add files -ADD solrconfig.xml \ -https://raw.githubusercontent.com/ckan/ckan/ckan-${CKAN_VERSION}/ckan/config/solr/schema.xml \ -https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/$SOLR_VERSION/solr/server/solr/configsets/basic_configs/conf/currency.xml \ -https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/$SOLR_VERSION/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \ -https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/$SOLR_VERSION/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \ -https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/$SOLR_VERSION/solr/server/solr/configsets/basic_configs/conf/protwords.txt \ -https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/$SOLR_VERSION/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml \ -/opt/solr/server/solr/$SOLR_CORE/conf/ +COPY solrconfig-${CKAN_VERSION}.xml /opt/solr/server/solr/${SOLR_CORE}/conf/solrconfig.xml +ADD https://raw.githubusercontent.com/ckan/ckan/ckan-${CKAN_VERSION}/ckan/config/solr/schema.xml \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/${SOLR_VERSION}/solr/server/solr/configsets/basic_configs/conf/currency.xml \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/${SOLR_VERSION}/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/${SOLR_VERSION}/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/${SOLR_VERSION}/solr/server/solr/configsets/basic_configs/conf/protwords.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/${SOLR_VERSION}/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 diff --git a/solr/solrconfig.xml b/solr/solrconfig-2.9.4.xml similarity index 100% rename from solr/solrconfig.xml rename to solr/solrconfig-2.9.4.xml