Merge branch 'master' into patch-4

This commit is contained in:
Joshua Hesketh
2019-04-02 17:08:19 +11:00
committed by GitHub
58 changed files with 2220 additions and 1695 deletions

View File

@@ -1,10 +1,13 @@
FROM solr:7-alpine
FROM solr:7.7-alpine
USER root
COPY docker-entrypoint.sh /
COPY solr-config-7.7.0.xml /
COPY solr-schema-7.7.0.xml /
RUN apk --no-cache add su-exec curl tzdata \
&& chmod +x /docker-entrypoint.sh \
&& sync \
&& /docker-entrypoint.sh --bootstrap
&& bash /docker-entrypoint.sh --bootstrap
ENTRYPOINT ["/docker-entrypoint.sh"]