Compare commits
7
Commits
714f8fd2c9
...
361a859961
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
361a859961 | ||
|
|
d8b555c7c3 | ||
|
|
05b3e23770 | ||
|
|
6440eb8d9b | ||
|
|
458d852ef0 | ||
|
|
8757bf65fa | ||
|
|
842765d31a |
+2
-1
@@ -10,6 +10,7 @@ var_solr/*
|
|||||||
ressources/xdebug.ini
|
ressources/xdebug.ini
|
||||||
ressources/*.sql.gz
|
ressources/*.sql.gz
|
||||||
ai-docs/
|
ai-docs/
|
||||||
solr_cores_stage/
|
|
||||||
AGENTS.md
|
AGENTS.md
|
||||||
.vibe/
|
.vibe/
|
||||||
|
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:
|
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)
|
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:
|
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
|
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
|
||||||
|
|
||||||
@@ -112,4 +109,4 @@ dump_d8_db:
|
|||||||
docker exec materiod8-mysql-1 sh -c 'exec mariadb-dump -uroot -pmaterio materio_d8' > ./ressources/materio-d8-$(DATE_NOW)-local.sql
|
docker exec materiod8-mysql-1 sh -c 'exec mariadb-dump -uroot -pmaterio materio_d8' > ./ressources/materio-d8-$(DATE_NOW)-local.sql
|
||||||
|
|
||||||
sish:
|
sish:
|
||||||
ssh -p 2222 -R materio:80:dev:8890 CT-sish.me
|
ssh -p 2222 -R materio:80:dev:8890 CT-sish.me
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
# Régénère la config Solr depuis Drupal (search_api_solr) et l'écrit dans un arbre du dépôt solr_cores,
|
# Régénère la config Solr depuis Drupal (search_api_solr) et l'écrit dans un arbre du dépôt solr_cores,
|
||||||
# puis recharge les cores (RELOAD, sans restart).
|
# puis recharge les cores (RELOAD, sans restart).
|
||||||
#
|
#
|
||||||
# bin/update_solr_config.sh -> solr_cores (branche prod, Solr 8, :8985)
|
# bin/update_solr_config.sh -> solr_cores (Solr 9 local, :8985)
|
||||||
# bin/update_solr_config.sh solr_cores_stage URL -> worktree stage (Solr 9, phase 2)
|
# (solr_cores sur la branche stage pendant le projet IA ; plus de worktree solr_cores_stage)
|
||||||
#
|
#
|
||||||
# Les modifications restent à relire / committer dans l'arbre visé (git diff).
|
# Les modifications restent à relire / committer dans l'arbre visé (git diff).
|
||||||
|
|
||||||
@@ -15,15 +15,17 @@ CORES="materio_base materio_autocomplete"
|
|||||||
|
|
||||||
[ -d "$TREE/materio_base/conf" ] || { echo "arbre $TREE invalide" >&2; exit 1; }
|
[ -d "$TREE/materio_base/conf" ] || { echo "arbre $TREE invalide" >&2; exit 1; }
|
||||||
|
|
||||||
docker exec -i materiod8-php-1 drush cdel search_api_solr.solr_field_type.text_edgestring_ascii_und_6_0_0
|
# Généré depuis la config active : la garder alignée sur config/sync (drush cim) avant de lancer.
|
||||||
docker exec -i materiod8-php-1 drush cdel search_api_solr.solr_field_type.text_string_ascii_und_6_0_0
|
# Pas de « drush dre materio_sapi » : la désinstallation retire le bloc de recherche, les permissions
|
||||||
docker exec -i materiod8-php-1 drush dre materio_sapi
|
# et des champs de l'index database, et remet les types ASCII de config/install, plus anciens que ceux de config/sync.
|
||||||
docker exec -i materiod8-php-1 drush solr-gsc database_search_autocomplete config.zip || exit 1
|
docker exec -i materiod8-php-1 drush solr-gsc database_search_autocomplete config.zip || exit 1
|
||||||
mkdir -p ressources/solr/
|
mkdir -p ressources/solr/
|
||||||
mv public_html/web/config.zip ressources/solr/ || exit 1
|
mv public_html/web/config.zip ressources/solr/ || exit 1
|
||||||
|
|
||||||
|
# conf/ entièrement généré : on vide avant de décompresser (les fichiers retirés apparaissent dans git status)
|
||||||
for core in $CORES; do
|
for core in $CORES; do
|
||||||
unzip -o ressources/solr/config.zip -d "$TREE/$core/conf"
|
find "$TREE/$core/conf" -type f -delete
|
||||||
|
unzip -q -o ressources/solr/config.zip -d "$TREE/$core/conf"
|
||||||
done
|
done
|
||||||
|
|
||||||
for core in $CORES; do
|
for core in $CORES; do
|
||||||
|
|||||||
+27
-7
@@ -56,24 +56,41 @@ services:
|
|||||||
# - "6388"
|
# - "6388"
|
||||||
|
|
||||||
solr:
|
solr:
|
||||||
build: ./Docker/solr/
|
image: solr:9.11.0
|
||||||
# user: ${USER_UID}:${USER_GID}
|
# même structure que CT-materio (prod et stage, Solr 9.11 depuis le 16/11/2026) :
|
||||||
# même structure que CT-materio (prod) : SOLR_HOME = /var/solr/data (solr.xml + core.properties + index),
|
# 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)
|
# configsets = dépôt solr_cores (branche prod), monté en lecture seule (configSetBaseDir dans solr.xml)
|
||||||
environment:
|
environment:
|
||||||
- SOLR_HOME=/var/solr/data
|
- 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:
|
volumes:
|
||||||
- ./var_solr:/var/solr
|
- ./var_solr:/var/solr
|
||||||
- ./solr_cores:/opt/configsets:ro
|
- ./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:
|
networks:
|
||||||
- solr
|
- solr
|
||||||
ports:
|
ports:
|
||||||
- 8985: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
|
||||||
|
ollama:
|
||||||
|
image: ollama/ollama:0.40.16
|
||||||
|
environment:
|
||||||
|
# garde le modèle chargé en mémoire (pas de rechargement à froid entre deux appels)
|
||||||
|
- OLLAMA_KEEP_ALIVE=-1
|
||||||
|
# Ressources du futur CT-materio_embed (E4) : 4 cœurs, 2 Go. Cœurs physiques 0-3 du
|
||||||
|
# laptop (lscpu -e=CPU,CORE) ; Ollama ignore cette limite pour ses threads, le module
|
||||||
|
# envoie options.num_thread (materio_ai.settings:num_thread = 4).
|
||||||
|
cpuset: "0-3"
|
||||||
|
mem_limit: 2g
|
||||||
|
memswap_limit: 2g
|
||||||
|
volumes:
|
||||||
|
- ./var_ollama:/root/.ollama
|
||||||
|
networks:
|
||||||
|
- ollama
|
||||||
|
|
||||||
# solr-legacy:
|
# solr-legacy:
|
||||||
# build: ./Docker/solr-legacy/
|
# build: ./Docker/solr-legacy/
|
||||||
# volumes:
|
# volumes:
|
||||||
@@ -103,6 +120,7 @@ services:
|
|||||||
- redis
|
- redis
|
||||||
- server
|
- server
|
||||||
- solr
|
- solr
|
||||||
|
- ollama
|
||||||
# for xdebug
|
# for xdebug
|
||||||
# https://github.com/docker/for-linux/issues/264#issuecomment-965465879
|
# https://github.com/docker/for-linux/issues/264#issuecomment-965465879
|
||||||
extra_hosts:
|
extra_hosts:
|
||||||
@@ -113,6 +131,7 @@ services:
|
|||||||
# - mysql-legacy
|
# - mysql-legacy
|
||||||
- redis
|
- redis
|
||||||
- solr
|
- solr
|
||||||
|
- ollama
|
||||||
|
|
||||||
# php-legacy:
|
# php-legacy:
|
||||||
# build: ./Docker/php-legacy/
|
# build: ./Docker/php-legacy/
|
||||||
@@ -204,3 +223,4 @@ networks:
|
|||||||
redis:
|
redis:
|
||||||
server:
|
server:
|
||||||
solr:
|
solr:
|
||||||
|
ollama:
|
||||||
|
|||||||
+1
-1
Submodule public_html updated: 5846e0f4d3...f1ebea91db
+1
-1
Submodule solr_cores updated: 6ecfbdd621...3555c8b231
Reference in New Issue
Block a user