From 7bc3cb52a31bdd284d0dd05ca2b33db8bce59097 Mon Sep 17 00:00:00 2001 From: Daniel Worley Date: Mon, 14 Sep 2020 19:10:17 -0400 Subject: [PATCH] WIP port to using packages. Will require 8.7 release for full functionality. Also needs an updated wait-for-solr check to verify the packages have been installed before trying to create the collection. --- docker-compose.yml | 2 +- ocr/init/init.sh | 3 ++- solr/Dockerfile | 5 +++-- ...et-hl-formatter-1.0.1-solr7.1.0-SNAPSHOT.jar | Bin 4362 -> 0 bytes .../solr-payloads-1.0.3-solr7.1.0-SNAPSHOT.jar | Bin 15872 -> 0 bytes solr/post-hooks.sh | 6 ++++++ solr/solr-home/index/conf/schema.xml | 6 +++--- solr/solr-home/index/conf/solrconfig.xml | 6 +++--- 8 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 solr/lib/offset-hl-formatter-1.0.1-solr7.1.0-SNAPSHOT.jar delete mode 100644 solr/lib/solr-payloads-1.0.3-solr7.1.0-SNAPSHOT.jar create mode 100644 solr/post-hooks.sh diff --git a/docker-compose.yml b/docker-compose.yml index cb48224b8..317c5ff1e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: - "8983:8983" links: - zookeeper - command: "bash -c '/opt/solr/bin/solr start -f -z zookeeper:2181 -Dbootstrap_confdir=/solr-config/index/conf'" + command: "bash -c './post-hooks.sh & /opt/solr/bin/solr start -f -z zookeeper:2181 -Denable.packages=true -Dbootstrap_confdir=/solr-config/index/conf'" solr-proxy: build: ./solr-proxy diff --git a/ocr/init/init.sh b/ocr/init/init.sh index 69caabbaf..f8c81b197 100755 --- a/ocr/init/init.sh +++ b/ocr/init/init.sh @@ -6,8 +6,9 @@ # sleep 5 #done #echo "Sleeping 15" -#sleep 15 +sleep 15 ./wait-for-solr.sh --max-attempts 10 --wait-seconds 4 --solr-url http://solr:8983 +sleep 30 #echo "Uploading security.json to ZK" #/opt/solr/server/scripts/cloud-scripts/zkcli.sh -zkhost zookeeper:2181 -cmd putfile /security.json /code/security.json diff --git a/solr/Dockerfile b/solr/Dockerfile index e4ec612a6..19666ae22 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -1,4 +1,4 @@ -FROM solr:8.5 +FROM solr:8.6.2 # Add Tesseract USER root @@ -12,8 +12,9 @@ RUN mkdir -p /home/solr/ # Cache dir for fonts from Tika. RUN chown -R 8983:8983 /home/solr # Add Solr customizations -ADD lib/*.jar /opt/solr/server/solr-webapp/webapp/WEB-INF/lib/ ADD web.xml /opt/solr/server/solr-webapp/webapp/WEB-INF +ADD post-hooks.sh /opt/solr +RUN chmod +x /opt/solr/post-hooks.sh COPY solr-home /solr-config ADD set_heap.sh /docker-entrypoint-initdb.db diff --git a/solr/lib/offset-hl-formatter-1.0.1-solr7.1.0-SNAPSHOT.jar b/solr/lib/offset-hl-formatter-1.0.1-solr7.1.0-SNAPSHOT.jar deleted file mode 100644 index be56dc4af72a2d20a5f493c65ada6e7bc1d397b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4362 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 U#?*&Ng!IJUHR81a!$5lbA4QCq@Bjb+ diff --git a/solr/lib/solr-payloads-1.0.3-solr7.1.0-SNAPSHOT.jar b/solr/lib/solr-payloads-1.0.3-solr7.1.0-SNAPSHOT.jar deleted file mode 100644 index 3cb00a97e24f5d617027443d6a3373a5448bb881..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15872 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 CWIF%= diff --git a/solr/post-hooks.sh b/solr/post-hooks.sh new file mode 100644 index 000000000..b22994610 --- /dev/null +++ b/solr/post-hooks.sh @@ -0,0 +1,6 @@ +wait-for-solr.sh --max-attempts 25 --wait-seconds 4 --solr-url http://solr:8983 + +bin/solr package add-repo osc https://raw.githubusercontent.com/o19s/payload-component/master/repo +bin/solr package install solr-payloads:1.1.4 + + diff --git a/solr/solr-home/index/conf/schema.xml b/solr/solr-home/index/conf/schema.xml index 64a01051f..295a67e46 100644 --- a/solr/solr-home/index/conf/schema.xml +++ b/solr/solr-home/index/conf/schema.xml @@ -61,13 +61,13 @@ - + - + - + diff --git a/solr/solr-home/index/conf/solrconfig.xml b/solr/solr-home/index/conf/solrconfig.xml index d3ad237c0..0b4e2ca38 100644 --- a/solr/solr-home/index/conf/solrconfig.xml +++ b/solr/solr-home/index/conf/solrconfig.xml @@ -21,7 +21,7 @@ It is *not* a good example to work from. --> - 7.1 + 8.6 @@ -150,7 +150,7 @@ - + + class="solr-payloads:com.o19s.hl.OffsetFormatter">