A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: add redis to docker compose, fix websockets and add email to docker env
aminnausin9b69a501c209
diff --git a/docker-compose.yaml b/docker-compose.yamlindex 76bf40cd..b32153c6 100644--- a/docker-compose.yaml+++ b/docker-compose.yaml@@ -1,7 +1,7 @@services:app: &appimage: aminnausin/mediaserver:${DOCKER_RELEASE:-latest}- container_name: MediaServer+ container_name: mediaservervolumes:- ./data:/var/www/html/storage/app/public- ./logs/mediaServer:/var/www/html/storage/logs@@ -16,6 +16,7 @@ services:environment:- SHARED_UID=9999- SHARED_GID=9999+ restart: unless-stoppedhealthcheck:test: curl --fail http://${APP_HOST:-app.test}:8080/api/health || exit 1start_period: 10s@@ -26,74 +27,44 @@ services:- .envnetworks:default:- mediaServer-db:+ mediaserver-redis:+ mediaserver-db:aliases:- ${APP_HOST:-app.test}redis:image: redis:8-alpinecontainer_name: rediscommand: "redis-server --appendonly yes --requirepass phpredis"+ networks:+ mediaserver-redis:horizon:<<: *appcontainer_name: horizoncommand: ["php", "/var/www/html/artisan", "horizon"]- stop_signal: SIGTERM- depends_on:- - app- - redis- ports: []- expose: []- healthcheck:- test: ["CMD", "healthcheck-horizon"]- start_period: 10s- networks:- mediaServer-db:- default:- queue:- <<: *app- container_name: job_queue- command: ['php', '/var/www/html/artisan', 'queue:work', '--tries=3']+ init: trueenvironment:- - LOG_FILENAME=laravel-queue.log- ports: []- expose: []- stop_grace_period: 5s+ - LOG_FILENAME=laravel-horizon.log+ - REVERB_PORT=6001+ - REVERB_HOST=ws.app.test+ - REVERB_SCHEME=httpstop_signal: SIGTERMdepends_on:app:condition: service_healthy- healthcheck:- test: ['CMD', 'healthcheck-queue']- start_period: 10s- networks:- default:- mediaServer-db:- aliases: []- labels: []- event-queue:- <<: *app- container_name: event_queue- command: ['php', '/var/www/html/artisan', 'queue:work', '--queue=high', '--tries=3']- environment:- - LOG_FILENAME=laravel-event-queue.logports: []expose: []- stop_grace_period: 5s- stop_signal: SIGTERM- depends_on:- app:- condition: service_healthyhealthcheck:- test: ['CMD', 'healthcheck-queue']+ test: ["CMD", "healthcheck-horizon"]+ start_period: 10snetworks:- default:- mediaServer-db:+ mediaserver-redis:+ mediaserver-db:aliases: []- labels: []scheduler:<<: *app- container_name: laravel_scheduler+ container_name: laravel-schedulercommand: ['php', '/var/www/html/artisan', 'schedule:work']+ init: trueenvironment:- LOG_FILENAME=laravel-scheduler.logports: []@@ -107,13 +78,13 @@ services:test: ['CMD', 'healthcheck-schedule']networks:default:- mediaServer-db:+ mediaserver-db:aliases: []- labels: []ws:<<: *appcontainer_name: wscommand: php artisan reverb:start+ init: trueports: []expose:- 6001@@ -129,8 +100,9 @@ services:start_period: 10snetworks:default:- mediaServer-db:- aliases: []+ mediaserver-db:+ aliases:+ - ws.${APP_HOST:-app.test}caddy:image: "lucaslorentz/caddy-docker-proxy:ci-alpine"container_name: caddy@@ -161,12 +133,12 @@ services:- POSTGRESQL_USERNAME=${DB_USERNAME:-postgres}- POSTGRESQL_PASSWORD=${DB_PASSWORD:-root}healthcheck:- test: ['CMD-SHELL', 'pg_isready -U ${DB_USERNAME}', '-d', '${DB_DATABASE:-mediaServer}']+ test: ['CMD-SHELL', 'pg_isready -U ${DB_USERNAME:-postgres}', '-d', '${DB_DATABASE:-mediaServer}']interval: 5stimeout: 2sretries: 10networks:- - mediaServer-db+ - mediaserver-dbvolumes:db-data:driver: local@@ -177,5 +149,7 @@ volumes:networks:default:driver: bridge- mediaServer-db:+ mediaserver-db:+ driver: bridge+ mediaserver-redis:driver: bridgediff --git a/docker/.env.docker b/docker/.env.dockerindex 6ba89425..f803cda7 100644--- a/docker/.env.docker+++ b/docker/.env.docker@@ -59,3 +59,15 @@ PLAUSIBLE_API_TOKEN=# Cloudflare Token (unused)# ================================CF=++# ================================+# Email Setup+# ================================+MAIL_MAILER=smtp+MAIL_HOST=127.0.0.1+MAIL_PORT=1025+MAIL_USERNAME=+MAIL_PASSWORD=+MAIL_ENCRYPTION=+MAIL_FROM_ADDRESS="[email protected]"+MAIL_FROM_NAME="${APP_NAME}"