hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 18:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Solr Dockerfile by pulling Solr configs from main dspace image

Browse Source
This commit is contained in:
Tim Donohue
2020-01-16 16:33:19 -06:00
parent 6c864d678c
commit 7babc754cf
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dspace/src/main/docker/solr/Dockerfile
View File

@@ -6,11 +6,19 @@
# http://www.dspace.org/license/ # 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 EXPOSE 8983 8983
WORKDIR /opt/solr/server/solr WORKDIR /opt/solr/server/solr
USER solr USER solr
# Create DSpace-specific Solr cores (based on default configset provided by Solr)
RUN \ RUN \
cp -r configsets/_default authority && \ cp -r configsets/_default authority && \
mkdir authority/data &&\ mkdir authority/data &&\
@@ -21,7 +29,9 @@ RUN \
cp -r configsets/_default statistics && \ cp -r configsets/_default statistics && \
mkdir statistics/data mkdir statistics/data
COPY dspace/solr/authority authority/ # Copy the DSpace-specific Solr schemas & configs (from our 'dspace' image)
COPY dspace/solr/oai oai/ # into corresponding Solr core directory
COPY dspace/solr/search search/ COPY --from=dspace $DSPACE_INSTALL/solr/authority authority/
COPY dspace/solr/statistics statistics/ COPY --from=dspace $DSPACE_INSTALL/solr/oai oai/
COPY --from=dspace $DSPACE_INSTALL/solr/search search/
COPY --from=dspace $DSPACE_INSTALL/solr/statistics statistics/