Skip to content

A self-hosted media server and file management system

Fix docker checks

aminnausind2c161a09f05
diff --git a/docker-compose.yaml b/docker-compose.yaml
index db69649c..3906d7da 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -97,6 +97,9 @@ services:
- LOG_FILENAME=laravel-ws.log
env_file:
- .env
+ labels:
+ caddy: ${APP_HOST:-app.test}
+ caddy.reverse_proxy: '* {{upstreams 8086}}'
stop_grace_period: 5s
stop_signal: SIGTERM
healthcheck:
diff --git a/docker/.env.docker b/docker/.env.docker
index f223c0b1..1c833df0 100644
--- a/docker/.env.docker
+++ b/docker/.env.docker
@@ -68,7 +68,6 @@ PULSE_SERVER_DIRECTORIES="/"
REVERB_APP_ID=355744
REVERB_APP_KEY=
REVERB_APP_SECRET=
-REVERB_HOST="${APP_HOST}"
REVERB_SERVER_PORT=6001
REVERB_SERVER_HOST=0.0.0.0
REVERB_SCHEME="${APP_SCHEME}"
diff --git a/startDocker.bat b/startDocker.bat
index 365c7fe6..1ffaf2aa 100644
--- a/startDocker.bat
+++ b/startDocker.bat
@@ -24,14 +24,14 @@ if not exist "docker/etc/nginx/conf.d/default.conf" (
)
:: Ensure caddyfile exists
-if not exist "docker/etc/caddy/caddyfile" (
- echo ERROR: Missing /docker/etc/caddy/caddyfile
+if not exist "docker/etc/caddy/Caddyfile" (
+ echo ERROR: Missing /docker/etc/caddy/Caddyfile
echo Please download this file before running Docker.
pause
exit 1
) else (
echo Found caddy config
- echo Make sure to replace 'app.test' with your website URL in '/docker/etc/caddy/caddyfile' if you have one
+ echo Make sure to replace 'app.test' with your website URL in '/docker/etc/caddy/Caddyfile' and in .env if you have one
)
:: Ensure .env.docker exists -> Holds default environment variables
diff --git a/startDocker.sh b/startDocker.sh
index e69010c4..a7e1441f 100644
--- a/startDocker.sh
+++ b/startDocker.sh
@@ -27,14 +27,14 @@ else
fi
# Ensure caddyfile exists
-if [ ! -f "./docker/etc/caddy/caddyfile" ]; then
- echo "ERROR: Missing /docker/etc/caddy/caddyfile"
+if [ ! -f "./docker/etc/caddy/Caddyfile" ]; then
+ echo "ERROR: Missing /docker/etc/caddy/Caddyfile"
echo "Please download this file before running Docker."
pause
exit 1
else
echo "Found caddy config"
- echo "Make sure to replace 'app.test' with your website URL in '/docker/etc/caddy/caddyfile' if you have one"
+ echo "Make sure to replace 'app.test' with your website URL in '/docker/etc/caddy/Caddyfile' and in .env if you have one"
fi
# Ensure docker env exists