diff --git a/docker-compose.yml b/docker-compose.yml index 976078f..0b343b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,16 +13,16 @@ services: - APP_DEBUG=${APP_DEBUG:-false} - APP_URL=${APP_URL} - DB_CONNECTION=${DB_CONNECTION:-mysql} - - DB_HOST=${DB_HOST:-mariadb} + - DB_HOST=${DB_HOST} - DB_PORT=${DB_PORT:-3306} - DB_DATABASE=${DB_DATABASE:-zemail} - DB_USERNAME=${DB_USERNAME:-zemail_user} - - DB_PASSWORD=${DB_PASSWORD:-secret} + - DB_PASSWORD=${DB_PASSWORD} - CACHE_STORE=${CACHE_STORE:-redis} - QUEUE_CONNECTION=${QUEUE_CONNECTION:-redis} - SESSION_DRIVER=${SESSION_DRIVER:-redis} - - REDIS_HOST=${REDIS_HOST:-redis} - - REDIS_PASSWORD=${REDIS_PASSWORD:-null} + - REDIS_HOST=${REDIS_HOST} + - REDIS_PASSWORD=${REDIS_PASSWORD} - REDIS_PORT=${REDIS_PORT:-6379} healthcheck: test: [ "CMD", "curl", "-f", "http://localhost/health" ] @@ -33,29 +33,7 @@ services: volumes: - app-storage:/var/www/storage - app-public-tmp:/var/www/public/tmp - depends_on: - - redis - - mariadb - - redis: - image: redis:alpine - restart: unless-stopped - volumes: - - redis-data:/data - - mariadb: - image: mariadb:10.11 - restart: unless-stopped - environment: - - MYSQL_DATABASE=${DB_DATABASE:-zemail} - - MYSQL_USER=${DB_USERNAME:-zemail_user} - - MYSQL_PASSWORD=${DB_PASSWORD:-secret} - - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD:-rootsecret} - volumes: - - mariadb-data:/var/lib/mysql volumes: app-storage: app-public-tmp: - redis-data: - mariadb-data: