Merge pull request #14 from docksal/develop

Release 2.1.0
docksal · Oct 3, 2019 · e7af701 · e7af701
2 parents 642c635 + f67ae75
commit e7af701
Show file tree

Hide file tree

Showing 1,146 changed files with 261,221 additions and 71 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1 @@
 .idea/
-configsets
diff --git a/.travis.yml b/.travis.yml
@@ -7,9 +7,11 @@ env:
     - REPO=docksal/solr
 
   matrix:
-    - VERSION=5.5.5 FROM=solr:5.5.5-alpine SOLR_DEFAULT_CONFIG_SET=search_api_solr_8.x-1.2 TAGS=5.5,5
-    - VERSION=6.6.5 FROM=solr:6.6.5-alpine SOLR_DEFAULT_CONFIG_SET=search_api_solr_8.x-2.0 TAGS=6.6,6
-    - VERSION=7.5.0 FROM=solr:7.5.0-alpine SOLR_DEFAULT_CONFIG_SET=search_api_solr_8.x-2.0 TAGS=7.5,7,latest
+    - VERSION=5.5.5 FROM=solr:5.5.5-slim SOLR_DEFAULT_CONFIG_SET=search_api_solr_8.x-1.2 TAGS=5.5,5
+    - VERSION=6.6.5 FROM=solr:6.6.5-slim SOLR_DEFAULT_CONFIG_SET=search_api_solr_8.x-2.0 TAGS=6.6,6
+    - VERSION=7.5.0 FROM=solr:7.5.0-slim SOLR_DEFAULT_CONFIG_SET=search_api_solr_8.x-2.0 TAGS=7.5
+    - VERSION=7.7.1 FROM=solr:7.7.1-slim SOLR_DEFAULT_CONFIG_SET=search_api_solr_8.x-2.0 TAGS=7.7,7
+    - VERSION=8.1.1 FROM=solr:8.1.1-slim SOLR_DEFAULT_CONFIG_SET=search_api_solr_8.x-3.0 TAGS=8.1,8,latest
 
 install:
   # Install Docksal to have a matching versions of Docker on the build host

diff --git a/Dockerfile b/Dockerfile
@@ -14,11 +14,17 @@ COPY configsets /opt/docker-solr/configsets
 COPY scripts/healthcheck.sh /opt/docker-solr/scripts/healthcheck.sh
 COPY scripts/docksal-preinit /opt/docker-solr/scripts/docksal-preinit
 
+RUN set -xe; \
+	apt-get update && \
+	apt-get -y install sudo; \
+	echo "solr ALL=(ALL) NOPASSWD: ALL" >/etc/sudoers.d/solr; \
+	rm -rf /var/lib/apt/lists/*
+
 RUN set -xe; \
 	ln -s /opt/solr/dist /opt/dist; \
 	ln -s /opt/solr/contrib /opt/contrib; \
 	sed -i '/exec "$@"/i . docksal-preinit' /opt/docker-solr/scripts/docker-entrypoint.sh; \
-	chown -R solr:solr /opt/docker-solr
+	chown -R solr:solr /opt/docker-solr /opt/solr/server/solr
 
 USER solr
 

diff --git a/Makefile b/Makefile
@@ -1,12 +1,12 @@
 -include env_make
 
-VERSION ?= 7.5.0
-FROM ?= solr:7.5.0-alpine
+VERSION ?= 8.1.1
+FROM ?= solr:8.1.1-slim
 TAG ?= $(VERSION)
 
 REPO ?= docksal/solr
 NAME = docksal-solr-$(VERSION)
-SOLR_DEFAULT_CONFIG_SET ?= search_api_solr_8.x-2.0
+SOLR_DEFAULT_CONFIG_SET ?= search_api_solr_8.x-3.0
 
 ifneq ($(STABILITY_TAG),)
 	ifneq ($(TAG),latest)
@@ -17,7 +17,8 @@ endif
 .PHONY: build test push shell run start stop logs clean release
 
 build:
-	VERSION=$(VERSION) scripts/download_configsets.sh
+	git checkout -- configsets
+	VERSION=$(VERSION) scripts/prepare_configsets.sh
 	docker build -t $(REPO):$(TAG) --build-arg FROM=$(FROM) --build-arg VERSION=$(VERSION) --build-arg SOLR_DEFAULT_CONFIG_SET=$(SOLR_DEFAULT_CONFIG_SET) .
 
 test:

diff --git a/README.md b/README.md
@@ -9,7 +9,9 @@ This image(s) is part of the [Docksal](http://docksal.io) image library.
 
 - `docksal/solr:5.5`,
 - `docksal/solr:6.6`,
-- `docksal/solr:7.5`, `docksal/solr:latest`
+- `docksal/solr:7.5`,
+- `docksal/solr:7.7`,
+- `docksal/solr:8.1`, `docksal/solr:latest`
 
 For a complete list of available images tags check the image page on [Docker Hub](https://cloud.docker.com/u/docksal/repository/docker/docksal/solr).
 
@@ -35,25 +37,28 @@ with `[VERSION]` replaced to one of the listed below, e.g. `search_api_solr_8.x-
 
 Matrix of Search API Solr x Solr version support.
 
-| Version  | Solr 7.x | Solr 6.x | Solr 5.x |
-| -------- | -------- | -------- | -------- |
-| 8.x-2.5  | ✓        | ✓        |          |
-| 8.x-2.4  | ✓        | ✓        |          |
-| 8.x-2.3  | ✓        | ✓        |          |
-| 8.x-2.2  | ✓        | ✓        |          |
-| 8.x-2.1  | ✓        | ✓        |          |
-| 8.x-2.0  | ✓        | ✓        |          |
-| 8.x-1.2  |          | ✓        | ✓        |
-| 8.x-1.1  |          | ✓        | ✓        |
-| 8.x-1.0  |          | ✓        | ✓        |
-| 7.x-1.14 | ✓        | ✓        | ✓        |
-| 7.x-1.13 | ✓        | ✓        | ✓        |
-| 7.x-1.12 |          | ✓        | ✓        |
-| 7.x-1.11 |          |          | ✓        |
-| 7.x-1.10 |          |          | ✓        |
-| 7.x-1.9  |          |          | ✓        |
-| 7.x-1.8  |          |          | ✓        |
-| 7.x-1.7  |          |          | ✓        |
+| Version  | Solr 8.x | Solr 7.x | Solr 6.x | Solr 5.x |
+| -------- | -------- | -------- | -------- | -------- |
+| 8.x-3.0  | ✓        | ✓        | ✓        |          |
+| 8.x-2.7  |          | ✓        | ✓        |          |
+| 8.x-2.6  |          | ✓        | ✓        |          |
+| 8.x-2.5  |          | ✓        | ✓        |          |
+| 8.x-2.4  |          | ✓        | ✓        |          |
+| 8.x-2.3  |          | ✓        | ✓        |          |
+| 8.x-2.2  |          | ✓        | ✓        |          |
+| 8.x-2.1  |          | ✓        | ✓        |          |
+| 8.x-2.0  |          | ✓        | ✓        |          |
+| 8.x-1.2  |          |          | ✓        | ✓        |
+| 8.x-1.1  |          |          | ✓        | ✓        |
+| 8.x-1.0  |          |          | ✓        | ✓        |
+| 7.x-1.14 |          | ✓        | ✓        | ✓        |
+| 7.x-1.13 |          | ✓        | ✓        | ✓        |
+| 7.x-1.12 |          |          | ✓        | ✓        |
+| 7.x-1.11 |          |          |          | ✓        |
+| 7.x-1.10 |          |          |          | ✓        |
+| 7.x-1.9  |          |          |          | ✓        |
+| 7.x-1.8  |          |          |          | ✓        |
+| 7.x-1.7  |          |          |          | ✓        |
 
 ### Drupal Apache Solr
 
@@ -64,14 +69,18 @@ with `[VERSION]` replaced to one of the listed below, e.g. `apachesolr_7.x-1.11`
 
 Matrix of Apache Solr x Solr version support.
 
-| Version  | Solr 7.x | Solr 6.x | Solr 5.x |
-| -------- | -------- | -------- | -------- |
-| 7.x-1.11 |          |          | ✓        |
-| 7.x-1.10 |          |          | ✓        |
+| Version  | Solr 8.x | Solr 7.x | Solr 6.x | Solr 5.x |
+| -------- | -------- | -------- | -------- |--------- |
+| 7.x-1.11 |          |          |          | ✓        |
+| 7.x-1.10 |          |          |          | ✓        |
 
 
 ## Configuration overrides
 
 Configuration overrides can be added to a Docksal project codebase.
 
 Put configuration files into `.docksal/etc/solr/conf` to override the predefined configuration.
+
+## Credits
+
+This image was inspired by https://github.com/wodby/solr
diff --git a/configsets/apachesolr_7.x-1.0/conf/protwords.txt b/configsets/apachesolr_7.x-1.0/conf/protwords.txt
@@ -0,0 +1,8 @@
+#-----------------------------------------------------------------------
+# This file blocks words from being operated on by the stemmer and word delimiter.
+&amp;
+&lt;
+&gt;
+&#039;
+&quot;
+