Local Solr aligned with prod/stage: single Solr 9.11 service, Solr 8 and switch removed
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+1
-1
@@ -13,5 +13,5 @@ ai-docs/
|
||||
solr_cores_stage/
|
||||
AGENTS.md
|
||||
.vibe/
|
||||
var_solr9/
|
||||
var_solr8/
|
||||
var_ollama/
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
FROM solr:8.10.1
|
||||
|
||||
# COPY --chown=solr:solr ./server /opt/solr/server/solr/
|
||||
@@ -20,9 +20,6 @@ build:
|
||||
buildnc:
|
||||
docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME)
|
||||
|
||||
buildsolrnc:
|
||||
docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) solr
|
||||
|
||||
buildphp:
|
||||
docker-compose build --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) php
|
||||
|
||||
@@ -113,9 +110,3 @@ dump_d8_db:
|
||||
|
||||
sish:
|
||||
ssh -p 2222 -R materio:80:dev:8890 CT-sish.me
|
||||
|
||||
solr8:
|
||||
bin/solr_switch.sh 8
|
||||
|
||||
solr9:
|
||||
bin/solr_switch.sh 9
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
#! /bin/bash
|
||||
# Bascule le Drupal local entre Solr 8 (branche prod) et Solr 9 (branche stage).
|
||||
# bin/solr_switch.sh 8|9
|
||||
# Écrit (ou supprime) web/sites/default/settings.solr.php, inclus par settings.php, puis drush cr.
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")/.." || exit 1
|
||||
F=public_html/web/sites/default/settings.solr.php
|
||||
case "$1" in
|
||||
8) rm -f "$F" ;;
|
||||
9) cat > "$F" <<'PHP'
|
||||
<?php
|
||||
// Généré par bin/solr_switch.sh 9 : Drupal local -> conteneur solr9 (Solr 9)
|
||||
foreach (['materio', 'database_search_autocomplete'] as $server) {
|
||||
$config["search_api.server.$server"]['backend_config']['connector_config']['host'] = 'solr9';
|
||||
$config["search_api.server.$server"]['backend_config']['connector_config']['solr_version'] = '9';
|
||||
}
|
||||
PHP
|
||||
;;
|
||||
*) echo "usage: $0 8|9" >&2; exit 1 ;;
|
||||
esac
|
||||
docker exec materiod8-php-1 drush cr >/dev/null && echo "Drupal local -> Solr $1"
|
||||
+6
-24
@@ -56,39 +56,22 @@ services:
|
||||
# - "6388"
|
||||
|
||||
solr:
|
||||
build: ./Docker/solr/
|
||||
# user: ${USER_UID}:${USER_GID}
|
||||
# même structure que CT-materio (prod) : SOLR_HOME = /var/solr/data (solr.xml + core.properties + index),
|
||||
# configsets = dépôt solr_cores (branche prod), monté en lecture seule (configSetBaseDir dans solr.xml)
|
||||
environment:
|
||||
- SOLR_HOME=/var/solr/data
|
||||
volumes:
|
||||
- ./var_solr:/var/solr
|
||||
- ./solr_cores:/opt/configsets:ro
|
||||
# - solr-data: /var/solr
|
||||
# - "${SOLR_CORES}:/var/solr/data"
|
||||
# - "${SOLR_DATA}:/var/solr"
|
||||
# - "${SOLR_CORES}:/opt/solr/server/solr"
|
||||
networks:
|
||||
- solr
|
||||
ports:
|
||||
- 8985:8983
|
||||
|
||||
# Solr 9 pour la branche stage (même structure, configsets = worktree solr_cores_stage)
|
||||
solr9:
|
||||
image: solr:9.11.0
|
||||
# même structure que CT-materio (prod et stage, Solr 9.11 depuis le 16/11/2026) :
|
||||
# SOLR_HOME = /var/solr/data (solr.xml + core.properties + index),
|
||||
# configsets = dépôt solr_cores (branche prod), monté en lecture seule (configSetBaseDir dans solr.xml)
|
||||
environment:
|
||||
- SOLR_HOME=/var/solr/data
|
||||
- SOLR_MODULES=extraction,langid,ltr,analysis-extras
|
||||
# Solr 9 (security manager) : autorise la lecture des configsets hors SOLR_HOME
|
||||
- SOLR_OPTS=-Dsolr.allowPaths=/opt/configsets
|
||||
volumes:
|
||||
- ./var_solr9:/var/solr
|
||||
- ./solr_cores_stage:/opt/configsets:ro
|
||||
- ./var_solr:/var/solr
|
||||
- ./solr_cores:/opt/configsets:ro
|
||||
networks:
|
||||
- solr
|
||||
ports:
|
||||
- 8986:8983
|
||||
- 8985:8983
|
||||
|
||||
# Modèle d'embedding bge-m3 servi par Ollama (projet recherche IA, M1).
|
||||
# Pas de port publié : joignable seulement depuis php (réseau ollama), http://ollama:11434
|
||||
@@ -142,7 +125,6 @@ services:
|
||||
# - mysql-legacy
|
||||
- redis
|
||||
- solr
|
||||
- solr9
|
||||
- ollama
|
||||
|
||||
# php-legacy:
|
||||
|
||||
Reference in New Issue
Block a user