inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-10-08 14:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-2370: Get Docker SOLR_DATA_DIR_ROOT and SOLR_SOLR_MODEL_DIR values from ENV VARS

Browse Source
This commit is contained in:
Angel Borroy
2020-09-01 13:41:40 +02:00
parent f6a91ddf22
commit f9b442cda3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
search-services/packaging/src/docker/Dockerfile
View File

@@ -7,6 +7,10 @@ ENV DIST_DIR /opt/alfresco-search-services
ENV SOLR_ZIP ${project.build.finalName}.zip ENV SOLR_ZIP ${project.build.finalName}.zip
ENV LANG C.UTF-8 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 USERNAME=solr
ARG USERID=33007 ARG USERID=33007
@@ -33,7 +37,7 @@ RUN set -x \
&& mv $DIST_DIR/solrhome/alfrescoModels $DIST_DIR/data/ \ && mv $DIST_DIR/solrhome/alfrescoModels $DIST_DIR/data/ \
&& chown -R ${USERNAME}:${USERNAME} $DIST_DIR \ && chown -R ${USERNAME}:${USERNAME} $DIST_DIR \
&& echo '#Docker Setup' >> $DIST_DIR/solr.in.sh \ && 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/ COPY search_config_setup.sh $DIST_DIR/solr/bin/
RUN chmod +x $DIST_DIR/solr/bin/search_config_setup.sh RUN chmod +x $DIST_DIR/solr/bin/search_config_setup.sh