added solr for D8
This commit is contained in:
parent
6692f12208
commit
1a168ab835
1
.env
1
.env
@ -3,6 +3,7 @@ COMPOSE_PROJECT_NAME=materiod8
|
|||||||
PROJECT_ROOT=./public_html
|
PROJECT_ROOT=./public_html
|
||||||
LEGACY_ROOT=./public_html_legacy
|
LEGACY_ROOT=./public_html_legacy
|
||||||
LOG_ROOT=./log
|
LOG_ROOT=./log
|
||||||
|
SOLR_CORES=./solr_cores
|
||||||
|
|
||||||
DB_IMPORTE_FILE_D8=./ressources/materio_d8.sql
|
DB_IMPORTE_FILE_D8=./ressources/materio_d8.sql
|
||||||
DB_IMPORTE_FILE_D7=./ressources/materio_d7.sql
|
DB_IMPORTE_FILE_D7=./ressources/materio_d7.sql
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ drupal7/*
|
|||||||
log/*
|
log/*
|
||||||
*.sql
|
*.sql
|
||||||
bin/syncfiles.sh
|
bin/syncfiles.sh
|
||||||
|
solr_cores/*
|
||||||
|
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -4,3 +4,6 @@
|
|||||||
[submodule "public_html"]
|
[submodule "public_html"]
|
||||||
path = public_html
|
path = public_html
|
||||||
url = https://figureslibres.io/gogs/bachir/materio-d8.git
|
url = https://figureslibres.io/gogs/bachir/materio-d8.git
|
||||||
|
[submodule "solr_cores"]
|
||||||
|
path = solr_cores
|
||||||
|
url = https://figureslibres.io/gogs/bachir/solr-materio-d8.git
|
||||||
|
3
Docker/solr/Dockerfile
Normal file
3
Docker/solr/Dockerfile
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
FROM solr:8
|
||||||
|
|
||||||
|
# COPY --chown=solr:solr ./server /opt/solr/server/solr/
|
@ -51,6 +51,17 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "6388"
|
- "6388"
|
||||||
|
|
||||||
|
solr-new:
|
||||||
|
build: ./Docker/solr/
|
||||||
|
environment:
|
||||||
|
- SOLR_HOME=/opt/solr/server/solr
|
||||||
|
volumes:
|
||||||
|
- "${SOLR_CORES}:/opt/solr/server/solr"
|
||||||
|
# - solr-cores:/opt/solr/server/solr
|
||||||
|
networks:
|
||||||
|
- solr
|
||||||
|
ports:
|
||||||
|
- 8985:8983
|
||||||
|
|
||||||
solr-legacy:
|
solr-legacy:
|
||||||
build: ./Docker/solr-legacy/
|
build: ./Docker/solr-legacy/
|
||||||
@ -70,15 +81,18 @@ services:
|
|||||||
- php-root-data:/root
|
- php-root-data:/root
|
||||||
- "${PROJECT_ROOT}:/var/www/html/d8.materio.com/public_html"
|
- "${PROJECT_ROOT}:/var/www/html/d8.materio.com/public_html"
|
||||||
- "${LEGACY_ROOT}:/var/www/html/d7.materio.com/public_html"
|
- "${LEGACY_ROOT}:/var/www/html/d7.materio.com/public_html"
|
||||||
|
- "${LOG_ROOT}/php:/var/log:rw"
|
||||||
working_dir: "/var/www/html/d8.materio.com/public_html"
|
working_dir: "/var/www/html/d8.materio.com/public_html"
|
||||||
networks:
|
networks:
|
||||||
- database
|
- database
|
||||||
- redis
|
- redis
|
||||||
- server
|
- server
|
||||||
|
- solr
|
||||||
depends_on:
|
depends_on:
|
||||||
- mysql
|
- mysql
|
||||||
- mysql-legacy
|
- mysql-legacy
|
||||||
- redis
|
- redis
|
||||||
|
- solr-new
|
||||||
|
|
||||||
php-legacy:
|
php-legacy:
|
||||||
build: ./Docker/php-legacy/
|
build: ./Docker/php-legacy/
|
||||||
@ -87,6 +101,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- php-legacy-root-data:/root
|
- php-legacy-root-data:/root
|
||||||
- "${LEGACY_ROOT}:/var/www/html"
|
- "${LEGACY_ROOT}:/var/www/html"
|
||||||
|
- "${LOG_ROOT}/php-legacy:/var/log:rw"
|
||||||
working_dir: "/var/www/html"
|
working_dir: "/var/www/html"
|
||||||
networks:
|
networks:
|
||||||
- database
|
- database
|
||||||
@ -96,6 +111,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- mysql-legacy
|
- mysql-legacy
|
||||||
- redis-legacy
|
- redis-legacy
|
||||||
|
- solr-legacy
|
||||||
|
|
||||||
phpmyadmin:
|
phpmyadmin:
|
||||||
image: phpmyadmin/phpmyadmin
|
image: phpmyadmin/phpmyadmin
|
||||||
@ -120,6 +136,7 @@ services:
|
|||||||
working_dir: "/var/www/html/d8.materio.com/public_html"
|
working_dir: "/var/www/html/d8.materio.com/public_html"
|
||||||
networks:
|
networks:
|
||||||
- server
|
- server
|
||||||
|
- solr
|
||||||
depends_on:
|
depends_on:
|
||||||
- php
|
- php
|
||||||
|
|
||||||
@ -145,6 +162,7 @@ volumes:
|
|||||||
redis-data:
|
redis-data:
|
||||||
redis-legacy-data:
|
redis-legacy-data:
|
||||||
solr-cores-legacy:
|
solr-cores-legacy:
|
||||||
|
solr-cores:
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
database:
|
database:
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit b03b2d5c1012eab0becd26d2286caa236020f237
|
Subproject commit 26390343d0f6eafc5219c9825286c25b2183daf0
|
Loading…
x
Reference in New Issue
Block a user