From ea2820c39d7e5c8f3242c072c665811f93ad2322 Mon Sep 17 00:00:00 2001 From: mkalkbrenner Date: Wed, 26 Jan 2022 11:56:51 +0100 Subject: [PATCH 1/3] use official zookeeper image --- .../solr/docker-compose.solr-standalone.yaml | 10 ++++++---- docker-compose-services/solr/docker-compose.solr.yaml | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docker-compose-services/solr/docker-compose.solr-standalone.yaml b/docker-compose-services/solr/docker-compose.solr-standalone.yaml index b951e796..89713103 100644 --- a/docker-compose-services/solr/docker-compose.solr-standalone.yaml +++ b/docker-compose-services/solr/docker-compose.solr-standalone.yaml @@ -1,7 +1,7 @@ # DDev Solr Cloud service file. # # This is a variation of docker-compose.solr.yaml that only creates one Solr node and runs a single zookeeper in -# standalone mode. This setup is not recommended for a production environment but requires less ressources in a +# standalone mode. This setup is not recommended for a production environment but requires less resources in a # development environment. # # To access Solr after it is installed: @@ -50,7 +50,7 @@ services: command: bash -c "docker-entrypoint.sh solr zk cp file:/mnt/ddev_config/solr/security.json zk:/security.json && exec solr-foreground" zoo: - image: bitnami/zookeeper:3.7 + image: zookeeper:3.7 container_name: ddev-${DDEV_SITENAME}-zoo hostname: ddev-${DDEV_SITENAME}-zoo expose: @@ -62,12 +62,13 @@ services: # The pre-trained OpenNLP models require a much bigger buffer. JVMFLAGS: -Djute.maxbuffer=50000000 ZOO_MY_ID: 1 - ZOO_SERVERS: server.1=ddev-${DDEV_SITENAME}-zoo1:2888:3888 + ZOO_SERVERS: server.1=ddev-${DDEV_SITENAME}-zoo:2888:3888 ZOO_4LW_COMMANDS_WHITELIST: mntr, conf, ruok ALLOW_ANONYMOUS_LOGIN: "yes" volumes: - .:/mnt/ddev_config - - zoo:/bitnami/zookeeper + - zoo:/data + - zoolog:/datalog # This links the Solr service to the web service defined in the main # docker-compose.yml, allowing applications running inside the web container to @@ -79,3 +80,4 @@ services: volumes: solr: zoo: + zoolog: diff --git a/docker-compose-services/solr/docker-compose.solr.yaml b/docker-compose-services/solr/docker-compose.solr.yaml index f83319f5..4165bca2 100644 --- a/docker-compose-services/solr/docker-compose.solr.yaml +++ b/docker-compose-services/solr/docker-compose.solr.yaml @@ -90,7 +90,7 @@ services: - solr3:/var/solr zoo: - image: bitnami/zookeeper:3.7 + image: zookeeper:3.7 container_name: ddev-${DDEV_SITENAME}-zoo hostname: ddev-${DDEV_SITENAME}-zoo expose: @@ -107,7 +107,8 @@ services: ALLOW_ANONYMOUS_LOGIN: "yes" volumes: - .:/mnt/ddev_config - - zoo:/bitnami/zookeeper + - zoo:/data + - zoolog:/datalog # This links the Solr service to the web service defined in the main # docker-compose.yml, allowing applications running inside the web container to @@ -121,3 +122,4 @@ volumes: solr2: solr3: zoo: + zoolog: From c17d7d89bd00e783398d1509a96e7d59120e885d Mon Sep 17 00:00:00 2001 From: Randy Fay Date: Wed, 16 Mar 2022 14:17:54 -0600 Subject: [PATCH 2/3] Minor README updates --- docker-compose-services/solr/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-services/solr/README.md b/docker-compose-services/solr/README.md index b41ea23d..fa1323f8 100644 --- a/docker-compose-services/solr/README.md +++ b/docker-compose-services/solr/README.md @@ -73,7 +73,7 @@ Note: If you choose to run Solr Cloud using a single node in standalone mode, 2. Copy the `solr` folder (`including security.json`) to your project's `.ddev` directory. 3. Configure your application to connect Solr at `http://ddev--solr:8983`. 4. If you want to use Solr's APIs that require a trusted context configure Basic Auth with username `solr` and password `SolrRocks`. -5. (Re-)start your DDEV project. +5. `ddev restart`. ## Solarium @@ -112,7 +112,7 @@ $client = new Solarium\Client($adapter, $eventDispatcher, $config); * Enable the `search_api_solr_admin` module. (This sub-module is included in Search API Solr >= 4.2.1) * Create a search server using the Solr backend and select `Solr Cloud with Basic Auth` as connector: * HTTP protocol: `http` - * Solr node: `ddev--solr` (Replace by your project's name.) + * Solr node: `solr` (Replace by your project's name.) * Solr port: `8983` * Solr path: `/` * Default Solr collection: `techproducts` (You can define any name here. The collection will be created automatically.) @@ -124,7 +124,7 @@ $client = new Solarium\Client($adapter, $eventDispatcher, $config); ### Drupal and Search API Solr 4.1 and older -It is highly recommended to upgrade to the 4.2 version. But if you're required +Please upgrade to the 4.2+ versions. If you're required to use an older versions of the Search API Solr module you have to deploy the configset manually and create a collection using this configset afterwards. Therefore you need to use the `Download config.zip` function of Search API Solr. From 7570c45dca268951a3273fe71995e8f80715d442 Mon Sep 17 00:00:00 2001 From: Randy Fay Date: Wed, 16 Mar 2022 14:20:55 -0600 Subject: [PATCH 3/3] Replace unnecessary instances of ddev--solr --- docker-compose-services/solr/README.md | 8 ++++---- .../solr/docker-compose.solr-standalone.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose-services/solr/README.md b/docker-compose-services/solr/README.md index fa1323f8..39aa3aa3 100644 --- a/docker-compose-services/solr/README.md +++ b/docker-compose-services/solr/README.md @@ -34,7 +34,7 @@ development environment is to just stay with the default. Once up and running you can access Solr's UI within your browser by opening `http://.ddev.site:8983`. For example, if the project is named "myproject" the hostname will be `http://myproject.ddev.site:8983`. To access -the Solr container from the web container use `ddev--solr:8983`. +the Solr container from the web container use `solr:8983`. Solr Cloud depends on Zookeeper to share configurations between the Solr nodes. Therefore this service starts a single Zookeeper server on port 2181, too. It is @@ -71,7 +71,7 @@ Note: If you choose to run Solr Cloud using a single node in standalone mode, 1. Copy `docker-compose.solr.yaml` **or** `docker-compose.solr-standalone.yaml` to your project's `.ddev` directory. 2. Copy the `solr` folder (`including security.json`) to your project's `.ddev` directory. -3. Configure your application to connect Solr at `http://ddev--solr:8983`. +3. Configure your application to connect Solr at `http://solr:8983`. 4. If you want to use Solr's APIs that require a trusted context configure Basic Auth with username `solr` and password `SolrRocks`. 5. `ddev restart`. @@ -93,7 +93,7 @@ $config = [ 'endpoint' => [ 'localhost' => [ // Replace by your project's name: - 'host' => 'ddev--solr', + 'host' => 'solr', 'port' => 8983, 'path' => '/', // Use your collection name here: @@ -112,7 +112,7 @@ $client = new Solarium\Client($adapter, $eventDispatcher, $config); * Enable the `search_api_solr_admin` module. (This sub-module is included in Search API Solr >= 4.2.1) * Create a search server using the Solr backend and select `Solr Cloud with Basic Auth` as connector: * HTTP protocol: `http` - * Solr node: `solr` (Replace by your project's name.) + * Solr node: `solr` * Solr port: `8983` * Solr path: `/` * Default Solr collection: `techproducts` (You can define any name here. The collection will be created automatically.) diff --git a/docker-compose-services/solr/docker-compose.solr-standalone.yaml b/docker-compose-services/solr/docker-compose.solr-standalone.yaml index 89713103..2293ee72 100644 --- a/docker-compose-services/solr/docker-compose.solr-standalone.yaml +++ b/docker-compose-services/solr/docker-compose.solr-standalone.yaml @@ -10,7 +10,7 @@ # For example, if the project is named "myproject" the hostname will be: # http://myproject.ddev.site:8983 # - To access the Solr container from the web container use: -# ddev--solr:8983 +# solr:8983 # # To use this in your own project: # 1. Copy this file and the solr (including security.json) directory to your project's ".ddev" directory.