Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ ENV BASE_URL="https://raw.githubusercontent.com/pulibrary/princeton_ansible/main
ENV JTS_URL="$BASE_URL/jts-core-1.15.1.jar"
ENV CJK_URL="$BASE_URL/CJKFilterUtils-v4.0.jar"
ENV UMICH_URL="$BASE_URL/lucene-umich-solr-filters-2.0-solr-9.0.0.jar"
ENV NASHORN_URL="$BASE_URL/nashorn-core-15.4.jar"
ENV ASM_1_URL="$BASE_URL/asm-7.3.1.jar"
ENV ASM_2_URL="$BASE_URL/asm-commons-7.3.1.jar"
ENV ASM_3_URL="$BASE_URL/asm-tree-7.3.1.jar"
ENV ASM_4_URL="$BASE_URL/asm-util-7.3.1.jar"

ENV ANALYSIS_EXTRAS_PATH="/opt/solr/modules/analysis-extras/lib"
ENV SOLR_ANALYSIS_EXTRAS_PATH="$ANALYSIS_EXTRAS_PATH/solr-analysis-extras-9.9.0.jar"
Expand All @@ -27,6 +32,11 @@ USER root
RUN wget $CJK_URL -O $CJK_PATH
RUN wget $UMICH_URL -O $UMICH_PATH
RUN wget $JTS_URL -O $JTS_PATH
RUN wget $NASHORN_URL -P $EXTRAS_BASE_PATH
RUN wget $ASM_1_URL -P $EXTRAS_BASE_PATH
RUN wget $ASM_2_URL -P $EXTRAS_BASE_PATH
RUN wget $ASM_3_URL -P $EXTRAS_BASE_PATH
RUN wget $ASM_4_URL -P $EXTRAS_BASE_PATH
RUN cp $SOLR_ANALYSIS_EXTRAS_PATH $SOLR_ANALYSIS_EXTRAS_PATH_DEST
RUN cp $ICU4J_PATH $ICU4J_PATH_DEST
RUN cp $LUCENE_ICU_PATH $LUCENE_ICU_PATH_DEST
Expand Down
6 changes: 4 additions & 2 deletions docker/ci-start.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

bin/solr start --cloud --no-prompt -p 8984
server/scripts/cloud-scripts/zkcli.sh -zkhost localhost:9984 -cmd putfile /security.json /opt/solr/security.json
export SOLR_PORT=${SOLR_PORT:=8984}
export ZK_PORT=${ZK_PORT:=9984}
bin/solr start --cloud --no-prompt -p $SOLR_PORT
server/scripts/cloud-scripts/zkcli.sh -zkhost localhost:$ZK_PORT -cmd putfile /security.json /opt/solr/security.json
sleep infinity