From 487d8d7dfd068ba26fd4e4925a1997c33a3f65d0 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Thu, 16 Jun 2016 11:23:31 +0200 Subject: [PATCH] SEARCH-9: Configuration via solr.in.sh --- search-services/packaging/Dockerfile | 6 ++---- search-services/packaging/src/test/resources/solr.in.sh | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/search-services/packaging/Dockerfile b/search-services/packaging/Dockerfile index 7a7b0723b..97a2a50da 100644 --- a/search-services/packaging/Dockerfile +++ b/search-services/packaging/Dockerfile @@ -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 diff --git a/search-services/packaging/src/test/resources/solr.in.sh b/search-services/packaging/src/test/resources/solr.in.sh index 054755750..5b8e620ad 100755 --- a/search-services/packaging/src/test/resources/solr.in.sh +++ b/search-services/packaging/src/test/resources/solr.in.sh @@ -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 \ No newline at end of file +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" \ No newline at end of file