Fix Solr Dockerfile by pulling Solr configs from main dspace image

This commit is contained in:
Tim Donohue
2020-01-16 16:33:19 -06:00
parent 6c864d678c
commit 7babc754cf

View File

@@ -6,11 +6,19 @@
# http://www.dspace.org/license/
#
FROM solr:latest
# Define a 'dspace' alias for our latest v7 image
FROM dspace/dspace:dspace-7_x-jdk8 as dspace
# Pin to Solr v7 (v8 currently has build issues)
FROM solr:7
# Directory on 'dspace' image (see above) where DSpace is installed
ENV DSPACE_INSTALL=/dspace
# Expose Solr on localhost:8983
EXPOSE 8983 8983
WORKDIR /opt/solr/server/solr
USER solr
# Create DSpace-specific Solr cores (based on default configset provided by Solr)
RUN \
cp -r configsets/_default authority && \
mkdir authority/data &&\
@@ -21,7 +29,9 @@ RUN \
cp -r configsets/_default statistics && \
mkdir statistics/data
COPY dspace/solr/authority authority/
COPY dspace/solr/oai oai/
COPY dspace/solr/search search/
COPY dspace/solr/statistics statistics/
# Copy the DSpace-specific Solr schemas & configs (from our 'dspace' image)
# into corresponding Solr core directory
COPY --from=dspace $DSPACE_INSTALL/solr/authority authority/
COPY --from=dspace $DSPACE_INSTALL/solr/oai oai/
COPY --from=dspace $DSPACE_INSTALL/solr/search search/
COPY --from=dspace $DSPACE_INSTALL/solr/statistics statistics/