From 63b295259f793d73e58ce15e35621ab33f4e1094 Mon Sep 17 00:00:00 2001 From: Chingis Sandanov Date: Wed, 10 Jul 2019 16:43:45 +0700 Subject: [PATCH] Update solr versions, fix tests --- .env | 12 +++---- Makefile | 2 +- README.md | 54 +++++++++++++++--------------- tests/7/.env | 2 +- tests/8/.env | 4 +-- tests/8/docker-compose.yml | 2 +- tests/8/search-api-solr-server.yml | 30 ----------------- tests/8/search_api.server.solr.yml | 44 ++++++++++++++++++++++++ tests/8/tests.sh | 2 +- 9 files changed, 83 insertions(+), 69 deletions(-) delete mode 100644 tests/8/search-api-solr-server.yml create mode 100644 tests/8/search_api.server.solr.yml diff --git a/.env b/.env index e3e13d1318..bc21c49319 100644 --- 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 index 0449465a3d..11722580c7 100644 --- 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 index eefce543f6..7189a049f0 100644 --- 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 index 6f039b648e..1c14ea35a2 100644 --- 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 index 6af2313373..e5cfbe3c35 100644 --- 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 index 37e846f4f4..39d9629b33 100644 --- 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 deleted file mode 100644 index 2169366faa..0000000000 --- a/tests/8/search-api-solr-server.yml +++ /dev/null @@ -1,30 +0,0 @@ -uuid: 705c9f7c-0819-4ff6-8d97-d94435c12184 -langcode: en -status: true -dependencies: - module: - - search_api_solr -id: solr_6_4 -name: 'Solr 6.4' -description: '' -backend: search_api_solr -backend_config: - connector: standard - connector_config: - scheme: http - host: solr - port: '8983' - path: /solr - core: core1 - timeout: 5 - index_timeout: 5 - optimize_timeout: 10 - solr_version: '' - http_method: AUTO - retrieve_data: false - highlight_data: false - excerpt: false - skip_schema_check: false - site_hash: true - autocorrect_spell: true - autocorrect_suggest_words: true diff --git a/tests/8/search_api.server.solr.yml b/tests/8/search_api.server.solr.yml new file mode 100644 index 0000000000..96ca0019a2 --- /dev/null +++ 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 index 119636f436..ed7dcf90ed 100755 --- a/tests/8/tests.sh +++ b/tests/8/tests.sh @@ -67,7 +67,7 @@ check_rq "Redis" "Connected, using the PhpRedis 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