Skip to content

A self-hosted media server and file management system

fix: docker healthcheck and manifest issues

aminnausin237bf7ffae08
diff --git a/.env.example b/.env.example
index 167c0133..1dfeaf5e 100755
--- a/.env.example
+++ b/.env.example
@@ -34,7 +34,7 @@ DB_DATABASE=mediaServer
DB_USERNAME=postgres
DB_PASSWORD=root
-SANCTUM_STATEFUL_DOMAINS=${APP_HOST},${APP_HOST}:${APP_PORT},0.0.0.0:6001,${APP_HOST}:6001
+SANCTUM_STATEFUL_DOMAINS=${APP_HOST},${APP_HOST}:${APP_PORT},0.0.0.0:6001,${APP_HOST}:6001,localhost:${APP_PORT},127.0.0.1:${APP_PORT}
SESSION_DRIVER=database
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
diff --git a/Dockerfile b/Dockerfile
index 9c899743..46d24003 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -123,6 +123,10 @@ RUN composer dump-autoload && \
apk add --no-cache git && \
git config --global --add safe.directory /var/www/html && \
php artisan app:manifest && \
+ echo "--- Manifest contents ---" && \
+ cat storage/app/public/manifest.json && \
+ echo "--- Git HEAD ---" && \
+ git rev-parse --short HEAD || echo "Git not working" && \
rm -rf .git && \
apk del git && \
mkdir -p /var/www/html/storage/app/chrome/.config && \
diff --git a/bootstrap/app.php b/bootstrap/app.php
index d6cf600e..6234c371 100755
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -28,7 +28,12 @@ return Application::configure(basePath: dirname(__DIR__))
Request::HEADER_X_FORWARDED_AWS_ELB
);
$middleware->statefulApi();
- $middleware->trustHosts(at: [env('APP_HOST', 'app.test')]);
+ $middleware->trustHosts(at: [
+ '^localhost(:[0-9]+)?$',
+ '^127\.0\.0\.1(:[0-9]+)?$',
+ '^app\.test(:[0-9]+)?$',
+ env('APP_HOST', 'app.test'),
+ ]);
$middleware->web(append: [
\App\Http\Middleware\UserLastActive::class,
]);
diff --git a/config/sanctum.php b/config/sanctum.php
index c9c5251f..b5f91d64 100755
--- a/config/sanctum.php
+++ b/config/sanctum.php
@@ -15,15 +15,7 @@ return [
|
*/
- 'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', sprintf(
- '%s%s',
- // 'localhost,localhost:3000,127.0.0.1,127.0.0.1:8000,::1',
- 'app.test:8080',
- 'app.test:6001',
- 'localhost:6001',
- '0.0.0.0:6001',
- Sanctum::currentApplicationUrlWithPort()
- ))),
+ 'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', Sanctum::currentApplicationUrlWithPort())),
/*
|--------------------------------------------------------------------------
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b32153c6..fd02a5b3 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -16,6 +16,7 @@ services:
environment:
- SHARED_UID=9999
- SHARED_GID=9999
+ - HEALTHCHECK_PATH=/api/health
restart: unless-stopped
healthcheck:
test: curl --fail http://${APP_HOST:-app.test}:8080/api/health || exit 1
@@ -78,6 +79,7 @@ services:
test: ['CMD', 'healthcheck-schedule']
networks:
default:
+ mediaserver-redis:
mediaserver-db:
aliases: []
ws:
@@ -100,6 +102,7 @@ services:
start_period: 10s
networks:
default:
+ mediaserver-redis:
mediaserver-db:
aliases:
- ws.${APP_HOST:-app.test}