Browse Source

added solr for D8

Bachir Soussi Chiadmi 4 years ago
parent
commit
1a168ab835
6 changed files with 27 additions and 1 deletions
  1. 1 0
      .env
  2. 1 0
      .gitignore
  3. 3 0
      .gitmodules
  4. 3 0
      Docker/solr/Dockerfile
  5. 18 0
      docker-compose.yml
  6. 1 1
      public_html

+ 1 - 0
.env

@@ -3,6 +3,7 @@ COMPOSE_PROJECT_NAME=materiod8
 PROJECT_ROOT=./public_html
 LEGACY_ROOT=./public_html_legacy
 LOG_ROOT=./log
+SOLR_CORES=./solr_cores
 
 DB_IMPORTE_FILE_D8=./ressources/materio_d8.sql
 DB_IMPORTE_FILE_D7=./ressources/materio_d7.sql

+ 1 - 0
.gitignore

@@ -4,3 +4,4 @@ drupal7/*
 log/*
 *.sql
 bin/syncfiles.sh
+solr_cores/*

+ 3 - 0
.gitmodules

@@ -4,3 +4,6 @@
 [submodule "public_html"]
 	path = public_html
 	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 - 0
Docker/solr/Dockerfile

@@ -0,0 +1,3 @@
+FROM solr:8
+
+# COPY --chown=solr:solr ./server /opt/solr/server/solr/

+ 18 - 0
docker-compose.yml

@@ -51,6 +51,17 @@ services:
     ports:
       - "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:
     build: ./Docker/solr-legacy/
@@ -70,15 +81,18 @@ services:
       - php-root-data:/root
       - "${PROJECT_ROOT}:/var/www/html/d8.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"
     networks:
       - database
       - redis
       - server
+      - solr
     depends_on:
       - mysql
       - mysql-legacy
       - redis
+      - solr-new
 
   php-legacy:
     build: ./Docker/php-legacy/
@@ -87,6 +101,7 @@ services:
     volumes:
       - php-legacy-root-data:/root
       - "${LEGACY_ROOT}:/var/www/html"
+      - "${LOG_ROOT}/php-legacy:/var/log:rw"
     working_dir: "/var/www/html"
     networks:
       - database
@@ -96,6 +111,7 @@ services:
     depends_on:
       - mysql-legacy
       - redis-legacy
+      - solr-legacy
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
@@ -120,6 +136,7 @@ services:
     working_dir: "/var/www/html/d8.materio.com/public_html"
     networks:
       - server
+      - solr
     depends_on:
       - php
 
@@ -145,6 +162,7 @@ volumes:
     redis-data:
     redis-legacy-data:
     solr-cores-legacy:
+    solr-cores:
 
 networks:
     database:

+ 1 - 1
public_html

@@ -1 +1 @@
-Subproject commit b03b2d5c1012eab0becd26d2286caa236020f237
+Subproject commit 26390343d0f6eafc5219c9825286c25b2183daf0