Skip to content

Commit 7a61962

Browse files
committed
Changes for solr9
1 parent 696206a commit 7a61962

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ ARG BUILD_DATE
44
ARG VCS_REF
55
ARG VERSION
66

7-
ADD data /solr-conf
8-
VOLUME /opt/solr/server/solr/mycores/
9-
COPY scripts /opt/docker-solr/scripts
7+
ENV SOLR_HOME=/solr_home
108

11-
CMD ["solr-precreate", "drupal", "/solr-conf"]
9+
ADD data /solr-conf
10+
VOLUME /solr_home
11+
COPY scripts /scripts
1212

1313
LABEL ca.unb.lib.generator="solr" \
1414
com.microscaling.docker.dockerfile="/Dockerfile" \

docker-compose.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.6'
2-
31
services:
42
drupal-solr-lib-unb-ca:
53
build:
@@ -9,7 +7,7 @@ services:
97
networks:
108
- lib.unb.ca
119
entrypoint:
12-
- docker-entrypoint-multiple.sh
10+
- /scripts/docker-entrypoint-multiple.sh
1311
- pages.lib.unb.ca:/solr-conf
1412

1513
networks:

scripts/docker-entrypoint-multiple.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ set -e
66

77
for core in "$@"
88
do
9-
echo "Creating Core $core"
9+
echo "*Creating Core* $core"
1010
CORE_NAME=$(echo $core | cut -f1 -d:)
1111
CORE_CONF=$(echo $core | cut -f2 -d:)
12-
/opt/docker-solr/scripts/precreate-core $CORE_NAME $CORE_CONF
12+
precreate-core $CORE_NAME $CORE_CONF
13+
echo "Core $CORE_NAME created with config $CORE_CONF"
1314
done
1415

16+
echo "Starting Solr..."
1517
docker-entrypoint.sh solr-foreground

0 commit comments

Comments
 (0)