Commit a3823e1c authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Adding external data volumes.

parent 1dcb2e55

solr-cloud/Dockerfile

+4 −2
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ RUN mkdir -p /usr/share/maven \ 
ENV MAVEN_HOME /usr/share/maven

VOLUME /root/.m2



# create installation directory

ENV SOLR_CLOUD_HOME /usr/local/solr-cloud

# create installation and data directories

ENV SOLR_CLOUD_INSTALL /usr/local/solr-cloud-install

RUN mkdir -p $SOLR_CLOUD_INSTALL

ENV SOLR_CLOUD_HOME /esg/solr-cloud-home

RUN mkdir -p $SOLR_CLOUD_HOME



# mvn: install 3 Solr instances configured for ESGF

solr-cloud/docker-compose.yml

+9 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ services: 
    networks:

      - default

    entrypoint: /usr/local/bin/docker-entrypoint.sh

    volumes:

      - solr_cloud_data1:/esg/solr-cloud-home



  # other node with 3 Solr instances

  esgf-solr-cloud2:
@@ -28,7 +30,13 @@ services: 
    networks:

      - default

    entrypoint: /usr/local/bin/docker-entrypoint.sh esgf-solr-cloud1

    #command: tail -f /dev/null

    volumes:

      - solr_cloud_data2:/esg/solr-cloud-home

    # dependency garantees that this node does not start untill ZK is up

    depends_on:

      - esgf-solr-cloud1



# persistent volumes containing Solr index data and configuration (one for each container)

volumes:

  solr_cloud_data1:

  solr_cloud_data2:

solr-cloud/scripts/docker-entrypoint.sh

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ zkhost=$1 


/usr/local/bin/solr_cloud_start.sh $zkhost



tail -f $SOLR_CLOUD_HOME/solr/server/logs/solr.log
 
tail -f $SOLR_CLOUD_INSTALL/solr/server/logs/solr.log

solr-cloud/scripts/solr_cloud_init.sh

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# All necessary Solr instances must be running prior to executing this script.



# upload configuration to ZooKeeper

$SOLR_CLOUD_HOME/solr/server/scripts/cloud-scripts/zkcli.sh \

$SOLR_CLOUD_INSTALL/solr/server/scripts/cloud-scripts/zkcli.sh \

	-zkhost localhost:9983 \

	-cmd upconfig -confdir $SOLR_CLOUD_HOME/node8983/solr/conf -confname esgf_config

solr-cloud/scripts/solr_cloud_start.sh

+6 −6
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ zkhost=$1 
echo "Using zkhost=$zkhost"

if [ "$zkhost" = "" ]; then

   # start first Solr as leader

   $SOLR_CLOUD_HOME/solr/bin/solr start -c -p 8983 -s $SOLR_CLOUD_HOME/node8983/solr/  -m 512m

   $SOLR_CLOUD_INSTALL/solr/bin/solr start -c -p 8983 -s $SOLR_CLOUD_HOME/node8983/solr/  -m 512m

   # connect other Solrs to ZK on localhost

   $SOLR_CLOUD_HOME/solr/bin/solr start -c -p 8984 -s $SOLR_CLOUD_HOME/node8984/solr/ -z localhost:9983 -m 512m

   $SOLR_CLOUD_HOME/solr/bin/solr start -c -p 8985 -s $SOLR_CLOUD_HOME/node8985/solr/ -z localhost:9983 -m 512m

   $SOLR_CLOUD_INSTALL/solr/bin/solr start -c -p 8984 -s $SOLR_CLOUD_HOME/node8984/solr/ -z localhost:9983 -m 512m

   $SOLR_CLOUD_INSTALL/solr/bin/solr start -c -p 8985 -s $SOLR_CLOUD_HOME/node8985/solr/ -z localhost:9983 -m 512m

else

   # connect all Solrs to ZK on given zkhost

   $SOLR_CLOUD_HOME/solr/bin/solr start -c -p 8983 -s $SOLR_CLOUD_HOME/node8983/solr/ -z $zkhost:9983 -m 512m 

   $SOLR_CLOUD_HOME/solr/bin/solr start -c -p 8984 -s $SOLR_CLOUD_HOME/node8984/solr/ -z $zkhost:9983 -m 512m

   $SOLR_CLOUD_HOME/solr/bin/solr start -c -p 8985 -s $SOLR_CLOUD_HOME/node8985/solr/ -z $zkhost:9983 -m 512m

   $SOLR_CLOUD_INSTALL/solr/bin/solr start -c -p 8983 -s $SOLR_CLOUD_HOME/node8983/solr/ -z $zkhost:9983 -m 512m 

   $SOLR_CLOUD_INSTALL/solr/bin/solr start -c -p 8984 -s $SOLR_CLOUD_HOME/node8984/solr/ -z $zkhost:9983 -m 512m

   $SOLR_CLOUD_INSTALL/solr/bin/solr start -c -p 8985 -s $SOLR_CLOUD_HOME/node8985/solr/ -z $zkhost:9983 -m 512m

fi