wululu_web/invoiceninja-docker
3
0
Fork 0
mirror of https://github.com/invoiceninja/dockerfiles.git synced 2026-02-07 06:29:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

make mysql and redis available/default again

Browse Source
This commit is contained in:
Benjamin Brummer
2024-12-28 09:25:25 +01:00
parent 068acdd097
commit 9c96e9d261
1 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
debian/docker-compose.yml vendored
View File

@@ -30,10 +30,14 @@ services:
healthcheck: healthcheck:
start_period: 180s start_period: 180s
depends_on: depends_on:
mariadb: mysql:
condition: service_healthy condition: service_healthy
valkey: redis:
condition: service_healthy condition: service_healthy
# mariadb:
# condition: service_healthy
# valkey:
# condition: service_healthy
logging: *default-logging logging: *default-logging
app-worker: app-worker:
@@ -65,39 +69,74 @@ services:
condition: service_healthy condition: service_healthy
logging: *default-logging logging: *default-logging
mariadb: mysql:
image: mariadb:11.4 image: mysql:8
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- ./.env - ./.env
environment: environment:
MARIADB_DATABASE: ${DB_DATABASE} MYSQL_DATABASE: ${DB_DATABASE}
MARIADB_USER: ${DB_USERNAME} MYSQL_USER: ${DB_USERNAME}
MARIADB_PASSWORD: ${DB_PASSWORD} MYSQL_PASSWORD: ${DB_PASSWORD}
MARIADB_ROOT_PASSWORD: ${DB_ROOT_PASSWORD} MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
volumes: volumes:
- mariadb:/var/lib/mysql - mysql_data:/var/lib/mysql
healthcheck: healthcheck:
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] test: [ "CMD", "mysqladmin", "ping", "-h", "localhost", "-u${MYSQL_USER}", "-p${MYSQL_PASSWORD}" ]
start_period: 60s interval: 10s
timeout: 5s
retries: 5
logging: *default-logging logging: *default-logging
valkey: redis:
image: valkey/valkey:8 image: redis:alpine
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- valkey:/data - redis_data:/data
healthcheck: healthcheck:
test: [ "CMD", "valkey-cli", "ping" ] test: [ "CMD", "redis-cli", "ping" ]
start_period: 10s interval: 10s
timeout: 5s
retries: 5
logging: *default-logging logging: *default-logging
# mariadb:
# image: mariadb:11.4
# restart: unless-stopped
# env_file:
# - ./.env
# environment:
# MARIADB_DATABASE: ${DB_DATABASE}
# MARIADB_USER: ${DB_USERNAME}
# MARIADB_PASSWORD: ${DB_PASSWORD}
# MARIADB_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
# volumes:
# - mariadb:/var/lib/mysql
# healthcheck:
# test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
# start_period: 60s
# logging: *default-logging
# valkey:
# image: valkey/valkey:8
# restart: unless-stopped
# volumes:
# - valkey:/data
# healthcheck:
# test: [ "CMD", "valkey-cli", "ping" ]
# start_period: 10s
# logging: *default-logging
volumes: volumes:
app_cache: app_cache:
driver: local driver: local
app_storage: app_storage:
driver: local driver: local
mariadb: mysql_data:
driver: local driver: local
valkey: redis_data:
driver: local driver: local
# mariadb:
# driver: local
# valkey:
# driver: local