SEARCH-9: Configuration via solr.in.sh

This commit is contained in:
Gethin James
2016-06-16 11:23:31 +02:00
parent e25d837fa3
commit 487d8d7dfd
2 changed files with 4 additions and 5 deletions

View File

@@ -5,8 +5,6 @@ MAINTAINER Gethin James, gethin.james@alfresco.com
ENV SOLR_ZIP target/alfresco-solr-distribution-*.zip
ENV DIST_DIR /opt/alfresco-solr
ENV SOLR_SOLR_CONTENT_DIR $DIST_DIR/data/content
ENV SOLR_SOLR_MODEL_DIR $DIST_DIR/data/alfrescoModels
ENV SOLR_INCLUDE $DIST_DIR/solr.in.sh
RUN groupadd -r solr && useradd -r -g solr -s /bin/bash solr
@@ -21,8 +19,8 @@ COPY target/test-classes/solr.in.sh $DIST_DIR/
WORKDIR $DIST_DIR
RUN unzip *.zip -d $DIST_DIR/ && rm *.zip && \
mkdir -p $SOLR_SOLR_CONTENT_DIR && \
mkdir -p $DIST_DIR/data/index && \
mkdir -p $DIST_DIR/data/content && \
mkdir -p $DIST_DIR/data/indexroot && \
mv $DIST_DIR/solrhome/alfrescoModels $DIST_DIR/data/ && \
mv $DIST_DIR/solrhome $DIST_DIR/data/ && \
chown -R solr:solr $DIST_DIR

View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash
# Path to a directory for Solr to store cores and their data. By default, Solr will use server/solr
# This directory needs to contain solr.xml
SOLR_HOME=$DIST_DIR/data/solrhome
SOLR_HOME=$DIST_DIR/data/solrhome
SOLR_OPTS="$SOLR_OPTS -Dsolr.data.dir.root=/opt/alfresco-solr/data/indexroot -Dsolr.solr.content.dir=/opt/alfresco-solr/data/content -Dsolr.solr.model.dir=/opt/alfresco-solr/data/alfrescoModels"