Update base docker compose file

This commit is contained in:
Christopher C. Wells 2024-02-02 10:16:17 -08:00
parent 33d3a7421f
commit 2a05ebc3c8
1 changed files with 27 additions and 33 deletions

View File

@ -25,7 +25,7 @@ services:
- db - db
- redis - redis
db: db:
image: 'mysql/mysql-server:8.0' image: 'mariadb:10'
ports: ports:
- '${FORWARD_DB_PORT:-3306}:3306' - '${FORWARD_DB_PORT:-3306}:3306'
environment: environment:
@ -34,7 +34,7 @@ services:
MYSQL_DATABASE: '${DB_DATABASE:-kcal}' MYSQL_DATABASE: '${DB_DATABASE:-kcal}'
MYSQL_USER: '${DB_USERNAME:-kcal}' MYSQL_USER: '${DB_USERNAME:-kcal}'
MYSQL_PASSWORD: '${DB_PASSWORD:-kcal}' MYSQL_PASSWORD: '${DB_PASSWORD:-kcal}'
MYSQL_ALLOW_EMPTY_PASSWORD: 1 MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
volumes: volumes:
- 'db-data:/var/lib/mysql' - 'db-data:/var/lib/mysql'
- './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh' - './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh'
@ -64,19 +64,14 @@ services:
retries: 3 retries: 3
timeout: 5s timeout: 5s
elasticsearch: elasticsearch:
image: 'elasticsearch:7.14.1' image: 'elasticsearch:7.17.17'
environment: environment:
- xpack.security.enabled=false - xpack.security.enabled=false
- discovery.type=single-node - discovery.type=single-node
ulimits: deploy:
memlock: resources:
soft: -1 limits:
hard: -1 memory: 1G
nofile:
soft: 65536
hard: 65536
cap_add:
- IPC_LOCK
volumes: volumes:
- 'elasticsearch-data:/usr/share/elasticsearch/data' - 'elasticsearch-data:/usr/share/elasticsearch/data'
ports: ports:
@ -87,9 +82,9 @@ services:
phpmyadmin: phpmyadmin:
image: phpmyadmin image: phpmyadmin
ports: ports:
- 8081:80 - '8081:80'
environment: environment:
PMA_HOST: mysql PMA_HOST: db
MYSQL_ROOT_PASSWORD: '${DB_PASSWORD:-kcal}' MYSQL_ROOT_PASSWORD: '${DB_PASSWORD:-kcal}'
networks: networks:
- sail - sail
@ -104,4 +99,3 @@ volumes:
redis-data: redis-data:
driver: local driver: local
elasticsearch-data: elasticsearch-data:
driver: local