lot of stuff on this commit, no commited docker environement since a while

This commit is contained in:
2022-07-26 23:08:23 +02:00
parent b60aa7fae1
commit c610a39441
15 changed files with 193 additions and 55 deletions
+27 -11
View File
@@ -35,9 +35,10 @@ services:
redis:
image: redis:4
command: ["redis-server", "--appendonly", "yes"]
command: redis-server /usr/local/etc/redis.conf
volumes:
- redis-data:/data
- ./Docker/redis/redis.conf:/usr/local/etc/redis.conf
networks:
- redis
ports:
@@ -45,9 +46,10 @@ services:
redis-legacy:
image: redis:3
command: ["redis-server", "--appendonly", "yes"]
command: redis-server /usr/local/etc/redis.conf
volumes:
- redis-legacy-data:/data
- ./Docker/redis/redis.conf:/usr/local/etc/redis.conf
networks:
- redis
ports:
@@ -55,11 +57,17 @@ services:
solr-new:
build: ./Docker/solr/
# user: ${USER_UID}:${USER_GID}
environment:
- SOLR_HOME=/opt/solr/server/solr
- SOLR_HOME=/var/solr
volumes:
- "${SOLR_CORES}:/opt/solr/server/solr"
# - solr-cores:/opt/solr/server/solr
- ./var_solr:/var/solr
# - solr-data: /var/solr
# - "${SOLR_CORES}:/var/solr/data"
# - "${SOLR_DATA}:/var/solr"
# - "${SOLR_CORES}:/opt/solr/server/solr"
command:
- solr-precreate
networks:
- solr
ports:
@@ -80,6 +88,7 @@ services:
expose:
- 9000
- 9001
- 22
user: ${USER_UID}:${USER_GID}
volumes:
- php-user-data:/home/${USER_UNAME}
@@ -93,9 +102,11 @@ services:
- redis
- server
- solr
# extra_hosts:
# - "host.docker.internal:192.168.144.4"
# - "testhost:192.168.0.21"
# for xdebug
# https://github.com/docker/for-linux/issues/264#issuecomment-965465879
extra_hosts:
- host.docker.internal:host-gateway
# mem_limit: 512m
depends_on:
- mysql
- mysql-legacy
@@ -167,9 +178,14 @@ services:
volumes:
- "${PROJECT_ROOT}:/app"
- npm-user-data:/home/${USER_UNAME}
ports:
- 8788:8788
# ports:
# - 8788:8788
working_dir: "/app"
networks:
- server
environment:
- DRUPAL_ROOT=/var/www/html/d8.materio.com/public_html
- USER_UNAME=${USER_UNAME}
volumes:
php-user-data:
@@ -179,7 +195,7 @@ volumes:
redis-data:
redis-legacy-data:
solr-cores-legacy:
solr-cores:
# solr-cores:
npm-user-data:
networks: