A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
new compose caddy and nginx configs
aminnausin77dae9550895
diff --git a/docker-compose.yaml b/docker-compose.yamlindex 25df497e..1629f147 100644--- a/docker-compose.yaml+++ b/docker-compose.yaml@@ -3,61 +3,72 @@ services:image: aminnausin/mediaserver:latestcontainer_name: MediaServervolumes:- - app-public:/var/www/html/public- ./data:/var/www/html/storage/app/public- restart: unless-stopped+ - ./docker/nginx/app.conf:/etc/nginx/conf.d/default.confports:- - 9000:9000+ - '8080:8086'expose:- - '9000'+ - '8086'+ healthcheck:+ test: curl --fail http://${APP_HOST:-app.test}:8080/api/health || exit 1+ interval: 1m30s+ timeout: 30s+ retries: 3depends_on:- - db+ postgres:+ condition: service_healthyenv_file:- .envqueue:image: aminnausin/mediaserver:latestcontainer_name: job_queue- command: php artisan queue:work --timeout=3600 --tries=3- restart: unless-stopped+ command: ['php', '/var/www/html/artisan', 'queue:work', '--tries=3']volumes:- ./data:/var/www/html/storage/app/publicdepends_on:- - db+ postgres:+ condition: service_healthyenv_file:- .envstop_grace_period: 5sstop_signal: SIGTERM+ healthcheck:+ test: ['CMD', 'healthcheck-queue']+ start_period: 10sevent-queue:image: aminnausin/mediaserver:latestcontainer_name: event_queue- command: php artisan queue:work --queue=high --tries=3- restart: unless-stopped+ command: ['php', '/var/www/html/artisan', 'queue:work', '--queue=high', '--tries=3']volumes:- ./data:/var/www/html/storage/app/publicdepends_on:- - db+ postgres:+ condition: service_healthyenv_file:- .envstop_grace_period: 5sstop_signal: SIGTERM+ healthcheck:+ test: ['CMD', 'healthcheck-queue']scheduler:image: aminnausin/mediaserver:latestcontainer_name: laravel_scheduler- command: php artisan schedule:work- restart: unless-stopped+ command: ['php', '/var/www/html/artisan', 'schedule:work']volumes:- ./data:/var/www/html/storage/app/publicdepends_on:- - db+ postgres:+ condition: service_healthyenv_file:- .envstop_grace_period: 5sstop_signal: SIGTERM+ healthcheck:+ test: ['CMD', 'healthcheck-schedule']ws:image: aminnausin/mediaserver:latestcontainer_name: wscommand: php artisan reverb:start- restart: unless-stoppedvolumes:- ./data:/var/www/html/storage/app/publicports:@@ -65,26 +76,14 @@ services:expose:- '6001'depends_on:- - db+ postgres:+ condition: service_healthyenv_file:- .envstop_grace_period: 5sstop_signal: SIGTERM- nginx:- image: nginx:alpine- container_name: nginx- volumes:- - ./docker/nginx/app.conf:/etc/nginx/conf.d/default.conf- - ./data:/var/www/html/storage/app/public- - app-public:/var/www/html/public- ports:- - '${APP_PORT}:${APP_PORT}'- expose:- - ${APP_PORT}- depends_on:- - app- env_file:- - .env+ healthcheck:+ test: ['CMD', 'healthcheck-schedule']caddy:image: caddy:2.9.1-alpinecontainer_name: caddy@@ -94,9 +93,7 @@ services:- 443:443/udpvolumes:- ./docker/caddy/Caddyfile:/etc/caddy/Caddyfile- depends_on:- - nginx- db:+ postgres:image: bitnami/postgresql:17.2.0container_name: databaseplatform: linux/amd64@@ -106,14 +103,18 @@ services:volumes:- db-data:/bitnami/postgresqlenvironment:- - POSTGRESQL_DATABASE=${DB_DATABASE}+ - POSTGRESQL_DATABASE=${DB_DATABASE:-mediaServer}- POSTGRESQL_USERNAME=${DB_USERNAME}- POSTGRESQL_PASSWORD=${DB_PASSWORD}+ healthcheck:+ test: ['CMD-SHELL', 'pg_isready -U ${DB_USERNAME}', '-d', '${DB_DATABASE:-mediaServer}']+ interval: 5s+ timeout: 2s+ retries: 10volumes:db-data:driver: local- app-public:- driver: local+networks:default:driver: bridgediff --git a/docker/etc/caddy/CaddyFile b/docker/etc/caddy/CaddyFileindex 3fbecb3e..6052b3dd 100644--- a/docker/etc/caddy/CaddyFile+++ b/docker/etc/caddy/CaddyFile@@ -1,5 +1,14 @@app.test {- reverse_proxy nginx:8086 {+ # WebSocket Reverse Proxy for reverb+ reverse_proxy /app ws:6001 {+ header_up Host {host}+ header_up X-Forwarded-For {remote}+ header_up X-Forwarded-Proto {scheme}+ header_up Upgrade {upstream_upgrade}+ header_up Connection {upstream_connection}+ }++ reverse_proxy app:8086 {header_up X-Forwarded-For {remote}header_up X-Real-IP {remote}header_up X-Forwarded-Proto {scheme}diff --git a/docker/etc/nginx/conf.d/default.conf b/docker/etc/nginx/conf.d/default.confindex 10746075..75f1240d 100644--- a/docker/etc/nginx/conf.d/default.conf+++ b/docker/etc/nginx/conf.d/default.conf@@ -10,20 +10,6 @@ server {add_header X-Frame-Options "SAMEORIGIN";add_header X-Content-Type-Options "nosniff";- # location /app {- # proxy_http_version 1.1;- # proxy_set_header Host $http_host ;- # proxy_set_header Scheme $scheme;- # proxy_set_header SERVER_PORT $server_port;- # proxy_set_header REMOTE_ADDR $remote_addr;- # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;- # # proxy_set_header X-Forwarded-Proto $scheme;- # proxy_set_header Upgrade $http_upgrade;- # proxy_set_header Connection "Upgrade";-- # proxy_pass http://0.0.0.0:6001;- # }-include mime.types;location / {