From 5ba4939dfab261d6b850350a6719c30c1c1a5cf2 Mon Sep 17 00:00:00 2001
From: Angel Borroy <48685308+aborroy@users.noreply.github.com>
Date: Thu, 3 Sep 2020 09:57:06 +0200
Subject: [PATCH] Merge pull request #918 from
 Alfresco/fix/SEARCH-2370_DockerEnvVars
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SEARCH-2370: Get Docker SOLR_DATA_DIR_ROOT and SOLR_SOLR_MODEL_DIR va…
(cherry picked from commit 785d1e71f382bc6349f9305e81cccb6f8800f680)
---
 search-services/packaging/src/docker/Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile
index 21e34a14c..6cda58f02 100644
--- a/search-services/packaging/src/docker/Dockerfile
+++ b/search-services/packaging/src/docker/Dockerfile
@@ -7,6 +7,10 @@ ENV DIST_DIR /opt/alfresco-search-services
 ENV SOLR_ZIP ${project.build.finalName}.zip
 ENV LANG C.UTF-8
 
+# Get values from ENV VARS or use default values if ENV VARS are not specified
+ENV SOLR_DATA_DIR_ROOT=${SOLR_DATA_DIR_ROOT:-$DIST_DIR/data}
+ENV SOLR_SOLR_MODEL_DIR=${SOLR_SOLR_MODEL_DIR:-$DIST_DIR/data/alfrescoModels}
+
 ARG USERNAME=solr
 ARG USERID=33007
 
@@ -33,7 +37,7 @@ RUN set -x \
    && mv $DIST_DIR/solrhome/alfrescoModels $DIST_DIR/data/ \
    && chown -R ${USERNAME}:${USERNAME} $DIST_DIR \
    && echo '#Docker Setup' >> $DIST_DIR/solr.in.sh \
-   && echo 'SOLR_OPTS="$SOLR_OPTS -Dsolr.data.dir.root=$DIST_DIR/data -Dsolr.solr.model.dir=$DIST_DIR/data/alfrescoModels"' >> $DIST_DIR/solr.in.sh
+   && echo 'SOLR_OPTS="$SOLR_OPTS -Dsolr.data.dir.root=$SOLR_DATA_DIR_ROOT -Dsolr.solr.model.dir=$SOLR_SOLR_MODEL_DIR"' >> $DIST_DIR/solr.in.sh
 
 COPY search_config_setup.sh $DIST_DIR/solr/bin/
 RUN chmod +x $DIST_DIR/solr/bin/search_config_setup.sh