Commit e5f209a9 authored May 24, 2017 by Luca Cinquini

Starting Solr with supervisor

parent e39a242d

solr/Dockerfile

+3 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ ENV SOLR_VERSION 5.5.3
		ENV SOLR_INSTALL_DIR /usr/local/solr
		ENV SOLR_HOME /usr/local/solr-home
		ENV SOLR_DATA_DIR /esg/solr-index
		ENV SOLR_INCLUDE=${SOLR_HOME}/solr.in.sh

		RUN wget -O /tmp/solr-${SOLR_VERSION}.tgz http://archive.apache.org/dist/lucene/solr/${SOLR_VERSION}/solr-${SOLR_VERSION}.tgz
		RUN cd /usr/local && \
		@@ -36,6 +37,7 @@ RUN chown -R solr:solr ${SOLR_DATA_DIR}
		EXPOSE 8983
		EXPOSE 8984

		# startup
		COPY conf/ /etc/supervisor/conf.d/
		COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
		USER solr
		ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

solr/conf/supervisord.solr.conf

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		[group:solr]
		programs=master_8984,slave_8983

solr/conf/supervisord.solr_master_8984.conf

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		[program:master_8984]
		user=solr
		command=%(ENV_SOLR_INSTALL_DIR)s/bin/solr start -f -d %(ENV_SOLR_INSTALL_DIR)s/server -s %(ENV_SOLR_HOME)s/master-8984 -p 8984 -a '-Denable.master=true'

solr/conf/supervisord.solr_slave_8983.conf

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		[program:slave_8983]
		user=solr
		command=%(ENV_SOLR_INSTALL_DIR)s/bin/solr start -f -d %(ENV_SOLR_INSTALL_DIR)s/server -s %(ENV_SOLR_HOME)s/slave-8983 -p 8983 -a '-Denable.slave=true -Denable.master=true'

solr/scripts/docker-entrypoint.sh

+5 −5

Original line number	Diff line number	Diff line
		#!/bin/bash
		# script to start one Solr instance per shard
		# Script to start one Solr instance per shard
		# and keep the Docker container running

		cd $SOLR_INSTALL_DIR/bin
		export SOLR_INCLUDE=${SOLR_HOME}/solr.in.sh
		./solr start -d $SOLR_INSTALL_DIR/server -s $SOLR_HOME/master-8984 -p 8984 -a '-Denable.master=true'
		./solr start -d $SOLR_INSTALL_DIR/server -s $SOLR_HOME/slave-8983 -p 8983 -a '-Denable.slave=true -Denable.master=true'
		# start supervisor --> solr shards
		supervisord -c /etc/supervisord.conf

		# print out log file
		sleep 2
		tail -f $SOLR_INSTALL_DIR/server/logs/solr.log