Update solr versions, fix tests

wodby · Jul 10, 2019 · 63b2952 · 63b2952
1 parent 16d4e2e
commit 63b2952
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 69 deletions.
diff --git a/.env b/.env
@@ -52,15 +52,15 @@ NGINX_VHOST_PRESET=drupal8
 
 ### --- SOLR ---
 
-SOLR_CONFIG_SET="search_api_solr_8.x-2.7"
+SOLR_CONFIG_SET="search_api_solr_8.x-3.2"
+#SOLR_CONFIG_SET="search_api_solr_8.x-2.7"
 #SOLR_CONFIG_SET="search_api_solr_8.x-1.2"
 #SOLR_CONFIG_SET="search_api_solr_7.x-1.14"
 
-SOLR_TAG=7.7-3.1.4
-#SOLR_TAG=7.6-3.1.4
-#SOLR_TAG=7.5-3.1.4
-#SOLR_TAG=6.6-3.1.4
-#SOLR_TAG=5.5-3.1.4
+SOLR_TAG=8-4.0.0
+#SOLR_TAG=7-4.0.0
+#SOLR_TAG=6-4.0.0
+#SOLR_TAG=5-4.0.0
 
 ### --- ELASTICSEARCH ---
 

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ include docker.mk
 .PHONY: test
 
 DRUPAL_VER ?= 8
-PHP_VER ?= 7.2
+PHP_VER ?= 7.3
 
 test:
 	cd ./tests/$(DRUPAL_VER) && PHP_VER=$(PHP_VER) ./run.sh
diff --git a/README.md b/README.md
@@ -14,33 +14,33 @@ Docker4Drupal is a set of docker images optimized for Drupal. Use `docker-compos
 
 The Drupal stack consist of the following containers:
 
-| Container       | Versions                | Service name    | Image                              | Default |
-| --------------- | -------------------     | --------------- | ---------------------------------- | ------- |
-| [Nginx]         | 1.17, 1.16              | `nginx`         | [wodby/nginx]                      | ✓       |
-| [Apache]        | 2.4                     | `apache`        | [wodby/apache]                     |         |
-| [Drupal]        | 8, 7                    | `php`           | [wodby/drupal]                     | ✓       |
-| [PHP]           | 7.3, 7.2, 7.1, 5.6      | `php`           | [wodby/drupal-php]                 |         |
-| [MariaDB]       | 10.3, 10.2, 10.1        | `mariadb`       | [wodby/mariadb]                    | ✓       |
-| [PostgreSQL]    | 11, 10, 9.x             | `postgres`      | [wodby/postgres]                   |         |
-| [Redis]         | 5, 4                    | `redis`         | [wodby/redis]                      |         |
-| [Memcached]     | 1                       | `memcached`     | [wodby/memcached]                  |         |
-| [Varnish]       | 6.0, 4.1                | `varnish`       | [wodby/varnish]                    |         |
-| [Node.js]       | 12, 10, 8               | `node`          | [wodby/node]                       |         |
-| [Drupal node]   | 1.0                     | `drupal-node`   | [wodby/drupal-node]                |         |
-| [Solr]          | 7.7, 7.6, 7.5, 6.6, 5.5 | `solr`          | [wodby/solr]                       |         |
-| [Elasticsearch] | 7, 6                    | `elasticsearch` | [wodby/elasticsearch]              |         |
-| [Kibana]        | 7, 6                    | `kibana`        | [wodby/kibana]                     |         |
-| [OpenSMTPD]     | 6.0                     | `opensmtpd`     | [wodby/opensmtpd]                  |         |
-| [Mailhog]       | latest                  | `mailhog`       | [mailhog/mailhog]                  | ✓       |
-| [AthenaPDF]     | 2.10.0                  | `athenapdf`     | [arachnysdocker/athenapdf-service] |         |
-| [Rsyslog]       | latest                  | `rsyslog`       | [wodby/rsyslog]                    |         |
-| [Blackfire]     | latest                  | `blackfire`     | [blackfire/blackfire]              |         |
-| [Webgrind]      | 1.5                     | `webgrind`      | [wodby/webgrind]                   |         |
-| [Xhprof viewer] | latest                  | `xhprof`        | [wodby/xhprof]                     |         |
-| Adminer         | 4.6                     | `adminer`       | [wodby/adminer]                    |         |
-| phpMyAdmin      | latest                  | `pma`           | [phpmyadmin/phpmyadmin]            |         |
-| Portainer       | latest                  | `portainer`     | [portainer/portainer]              | ✓       |
-| Traefik         | latest                  | `traefik`       | [_/traefik]                        | ✓       |
+| Container       | Versions           | Service name    | Image                              | Default |
+| --------------- | ------------------ | --------------- | ---------------------------------- | ------- |
+| [Nginx]         | 1.17, 1.16         | `nginx`         | [wodby/nginx]                      | ✓       |
+| [Apache]        | 2.4                | `apache`        | [wodby/apache]                     |         |
+| [Drupal]        | 8, 7               | `php`           | [wodby/drupal]                     | ✓       |
+| [PHP]           | 7.3, 7.2, 7.1, 5.6 | `php`           | [wodby/drupal-php]                 |         |
+| [MariaDB]       | 10.3, 10.2, 10.1   | `mariadb`       | [wodby/mariadb]                    | ✓       |
+| [PostgreSQL]    | 11, 10, 9.x        | `postgres`      | [wodby/postgres]                   |         |
+| [Redis]         | 5, 4               | `redis`         | [wodby/redis]                      |         |
+| [Memcached]     | 1                  | `memcached`     | [wodby/memcached]                  |         |
+| [Varnish]       | 6.0, 4.1           | `varnish`       | [wodby/varnish]                    |         |
+| [Node.js]       | 12, 10, 8          | `node`          | [wodby/node]                       |         |
+| [Drupal node]   | 1.0                | `drupal-node`   | [wodby/drupal-node]                |         |
+| [Solr]          | 8, 7, 6, 5         | `solr`          | [wodby/solr]                       |         |
+| [Elasticsearch] | 7, 6               | `elasticsearch` | [wodby/elasticsearch]              |         |
+| [Kibana]        | 7, 6               | `kibana`        | [wodby/kibana]                     |         |
+| [OpenSMTPD]     | 6.0                | `opensmtpd`     | [wodby/opensmtpd]                  |         |
+| [Mailhog]       | latest             | `mailhog`       | [mailhog/mailhog]                  | ✓       |
+| [AthenaPDF]     | 2.10.0             | `athenapdf`     | [arachnysdocker/athenapdf-service] |         |
+| [Rsyslog]       | latest             | `rsyslog`       | [wodby/rsyslog]                    |         |
+| [Blackfire]     | latest             | `blackfire`     | [blackfire/blackfire]              |         |
+| [Webgrind]      | 1.5                | `webgrind`      | [wodby/webgrind]                   |         |
+| [Xhprof viewer] | latest             | `xhprof`        | [wodby/xhprof]                     |         |
+| Adminer         | 4.6                | `adminer`       | [wodby/adminer]                    |         |
+| phpMyAdmin      | latest             | `pma`           | [phpmyadmin/phpmyadmin]            |         |
+| Portainer       | latest             | `portainer`     | [portainer/portainer]              | ✓       |
+| Traefik         | latest             | `traefik`       | [_/traefik]                        | ✓       |
 
 Supported Drupal versions: 8 / 7
 

diff --git a/tests/7/.env b/tests/7/.env
@@ -8,7 +8,7 @@ DB_DRIVER=mysql
 MARIADB_TAG=10.3-3.6.0
 REDIS_TAG=5-3.1.0
 VARNISH_TAG=6.0-4.3.0
-SOLR_TAG=7.7-3.1.4
+SOLR_TAG=7-4.0.0
 SOLR_CONFIG_SET="search_api_solr_7.x-1.14"
 
 NGINX_VHOST_PRESET=drupal7

diff --git a/tests/8/.env b/tests/8/.env
@@ -8,8 +8,8 @@ DB_DRIVER=mysql
 MARIADB_TAG=10.3-3.6.0
 REDIS_TAG=5-3.1.0
 VARNISH_TAG=6.0-4.3.0
-SOLR_TAG=7.7-3.1.4
-SOLR_CONFIG_SET="search_api_solr_8.x-2.7"
+SOLR_TAG=8-4.0.0
+SOLR_CONFIG_SET="search_api_solr_8.x-3.2"
 
 NGINX_VHOST_PRESET=drupal8
 NGINX_TAG=1.17-5.6.2

diff --git a/tests/8/docker-compose.yml b/tests/8/docker-compose.yml
@@ -30,7 +30,7 @@ services:
       - ./tests.sh:/usr/local/bin/tests.sh
       - ./test.settings.php:/var/www/html/web/sites/default/test.settings.php
       - ./varnish-purger.yml:/var/www/html/web/varnish-purger.yml
-      - ./search-api-solr-server.yml:/var/www/html/web/search_api.server.solr_6_4.yml
+      - ./search_api.server.solr.yml:/var/www/html/web/search_api.server.solr.yml
 
   nginx:
     image: wodby/nginx:$NGINX_TAG

diff --git a/tests/8/search-api-solr-server.yml b/tests/8/search-api-solr-server.yml
diff --git a/tests/8/search_api.server.solr.yml b/tests/8/search_api.server.solr.yml
@@ -0,0 +1,44 @@
+uuid: d924874e-1b45-4be6-b245-1d5b361b3183
+langcode: en
+status: true
+dependencies:
+  config:
+  - search_api_solr.solr_field_type.text_edge_und_7_0_0
+  - search_api_solr.solr_field_type.text_edgestring_und_6_0_0
+  - search_api_solr.solr_field_type.text_en_7_0_0
+  - search_api_solr.solr_field_type.text_ngram_und_7_0_0
+  - search_api_solr.solr_field_type.text_ngramstring_und_6_0_0
+  - search_api_solr.solr_field_type.text_phonetic_en_7_0_0
+  - search_api_solr.solr_field_type.text_phonetic_und_7_0_0
+  - search_api_solr.solr_field_type.text_und_7_0_0
+  module:
+  - search_api_solr
+id: solr
+name: solr
+description: ''
+backend: search_api_solr
+backend_config:
+  connector: standard
+  connector_config:
+    scheme: http
+    host: solr
+    port: 8983
+    path: /
+    core: default
+    timeout: 5
+    index_timeout: 5
+    optimize_timeout: 10
+    finalize_timeout: 30
+    commit_within: 1000
+    solr_version: ''
+    http_method: AUTO
+    jmx: false
+    solr_install_dir: ../../..
+  disabled_field_types: {  }
+  retrieve_data: false
+  highlight_data: false
+  skip_schema_check: false
+  server_prefix: ''
+  domain: generic
+  optimize: false
+  site_hash: false
diff --git a/tests/8/tests.sh b/tests/8/tests.sh
@@ -67,7 +67,7 @@ check_rq "Redis" "Connected, using the <em>PhpRedis</em> client"
 check_rq "Trusted Host Settings" "Enabled"
 
 # Import solr server
-drupal cis --file search_api.server.solr_6_4.yml
+drupal cis --file search_api.server.solr.yml --directory /var/www/html/web
 check_rq "Solr servers" "1 server"
 
 # @TODO return varnish tests after purge module drush commands support drush 9