fix on docker

This commit is contained in:
ludo
2024-02-05 21:34:29 +01:00
parent 9e30118088
commit 54ab6b0231
2 changed files with 381 additions and 359 deletions

View File

@@ -39,7 +39,7 @@ services:
extra_hosts: extra_hosts:
- "dockerhost:${DOCKER_HOST_IP}" - "dockerhost:${DOCKER_HOST_IP}"
ports: ports:
- "127.0.0.1:${WORKSPACE_SSH_PORT}:22" - "${WORKSPACE_SSH_PORT}:22"
tty: true tty: true
environment: environment:
- PHP_IDE_CONFIG=${PHP_IDE_CONFIG} - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
@@ -106,7 +106,7 @@ services:
- ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG} - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
ports: ports:
- "127.0.0.1:${PHP_FPM_XDEBUG_PORT}:9003" - "${PHP_FPM_XDEBUG_PORT}:9003"
expose: expose:
- "9000" - "9000"
extra_hosts: extra_hosts:
@@ -179,7 +179,7 @@ services:
- ${NGINX_SITES_PATH}:/etc/nginx/sites-available - ${NGINX_SITES_PATH}:/etc/nginx/sites-available
- ${NGINX_SSL_PATH}:/etc/nginx/ssl - ${NGINX_SSL_PATH}:/etc/nginx/ssl
ports: ports:
- "${NGINX_HOST_HTTP_PORT}:80" - "127.0.0.1:${NGINX_HOST_HTTP_PORT}:80"
depends_on: depends_on:
- php-fpm - php-fpm
networks: networks:
@@ -208,7 +208,7 @@ services:
- ${DATA_PATH_HOST}/mysql:/var/lib/mysql - ${DATA_PATH_HOST}/mysql:/var/lib/mysql
- ${MYSQL_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d - ${MYSQL_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d
ports: ports:
- "127.0.0.1:${MYSQL_PORT}:3306" - "${MYSQL_PORT}:3306"
networks: networks:
- backend - backend
@@ -240,7 +240,7 @@ services:
- ${DATA_PATH_HOST}/redis:/data - ${DATA_PATH_HOST}/redis:/data
command: redis-server --requirepass ${REDIS_PASSWORD} command: redis-server --requirepass ${REDIS_PASSWORD}
ports: ports:
- "127.0.0.1:${REDIS_PORT}:6379" - "${REDIS_PORT}:6379"
networks: networks:
- backend - backend
@@ -267,7 +267,7 @@ services:
- MEMORY_LIMIT=${PMA_MEMORY_LIMIT} - MEMORY_LIMIT=${PMA_MEMORY_LIMIT}
- UPLOAD_LIMIT=${PMA_UPLOAD_LIMIT} - UPLOAD_LIMIT=${PMA_UPLOAD_LIMIT}
ports: ports:
- "127.0.0.1:${PMA_PORT}:80" - "${PMA_PORT}:80"
depends_on: depends_on:
- "${PMA_DB_ENGINE}" - "${PMA_DB_ENGINE}"
networks: networks:
@@ -306,8 +306,8 @@ services:
restart: unless-stopped restart: unless-stopped
image: 'quay.io/soketi/soketi:1.0-16-debian' image: 'quay.io/soketi/soketi:1.0-16-debian'
ports: ports:
- '127.0.0.1:${SOKETI_PORT:-6001}:6001' - '${SOKETI_PORT:-6001}:6001'
- '127.0.0.1:${SOKETI_METRICS_SERVER_PORT:-9601}:9601' - '${SOKETI_METRICS_SERVER_PORT:-9601}:9601'
environment: environment:
- SOKETI_DEBUG=1 - SOKETI_DEBUG=1
- SOKETI_DEFAULT_APP_ID=${PUSHER_APP_ID} - SOKETI_DEFAULT_APP_ID=${PUSHER_APP_ID}
@@ -362,7 +362,6 @@ services:
### Meilisearch ### Meilisearch
meilisearch: meilisearch:
container_name: meilisearch
image: getmeili/meilisearch:latest image: getmeili/meilisearch:latest
environment: environment:
- http_proxy - http_proxy
@@ -373,11 +372,9 @@ services:
# - MEILI_LOG_LEVEL # - MEILI_LOG_LEVEL
# - MEILI_DB_PATH=${MEILI_DB_PATH:-/data.ms} # - MEILI_DB_PATH=${MEILI_DB_PATH:-/data.ms}
ports: ports:
- 127.0.0.1:${MEILI_PORT:-7700}:7700 - ${MEILI_PORT:-7700}:7700
networks: networks:
- backend - backend
volumes: volumes:
- ${DATA_PATH_HOST}/meili_data:/meili_data - ${DATA_PATH_HOST}/meili_data:/meili_data
restart: unless-stopped restart: unless-stopped

View File

@@ -0,0 +1,25 @@
version: '3'
services:
meilisearch:
container_name: meilisearch
image: getmeili/meilisearch:v0.25.2
environment:
- http_proxy
- https_proxy
- MEILI_MASTER_KEY=${MEILI_MASTER_KEY:-masterKey}
- MEILI_NO_ANALYTICS=${MEILI_NO_ANALYTICS:-true}
- MEILI_ENV=${MEILI_ENV:-development}
- MEILI_LOG_LEVEL
- MEILI_DB_PATH=${MEILI_DB_PATH:-/data.ms}
ports:
- ${MEILI_PORT:-7700}:7700
networks:
- meilisearch
volumes:
- ./data.ms:/data.ms
restart: unless-stopped
networks:
meilisearch:
driver: bridge