Merge pull request #7878 from pixelfed/revert/docker-serversideup-v5-hardening

Revert "Merge pull request #7876 from pixelfed/docker/serversideup-v5…

.env.docker.example

@@ -25,7 +25,7 @@ MAX_PHOTO_SIZE="15000"
 MAX_CAPTION_LENGTH="500"
 MAX_ALBUM_LENGTH="4"
 MEDIA_TYPES="image/jpeg,image/jpg,image/png,image/gif" # Accepted upload mime types. 
-MODERN_MEDIA_TYPES="image/heic,image/heif,image/avif,image/jxl,image/webp" # webp/avif/jxl require the vips driver.
+MODERN_MEDIA_TYPES="image/avif,image/jxl,image/webp" # webp/avif/jxl require the vips driver.
 
 # Instance URL Configuration
 # IMPORTANT: Update these with your actual domain
@@ -33,18 +33,6 @@ APP_URL="https://yourdomain.com"
 APP_DOMAIN="yourdomain.com"
 ADMIN_DOMAIN="yourdomain.com"
 SESSION_DOMAIN=null # Keep as null unless required for sharing session cookies with subdomains like SSO
-
-# TRUSTED_PROXY (Required)
-# Read by the serversideup FrankenPHP image.
-#   cloudflare (default) - trust Cloudflare ranges (CF-Connecting-IP) + Docker networks
-#   sucuri               - trust Sucuri WAF ranges (X-Forwarded-For) + Docker networks
-#   local                - trust only private/Docker network ranges (X-Forwarded-For)
-#   off                  - disable trusted proxy handling
-TRUSTED_PROXY="local"
-
-# Trusted Proxies (Don't touch)
-# TRUST_PROXIES is read by Laravel's TrustProxies middleware. The serversideup
-# web server (Caddy) already validates the proxy before the request reaches PHP.
 TRUST_PROXIES="*"
 
 # Database Configuration

Dockerfile

@@ -239,10 +239,6 @@ RUN tee /usr/local/etc/php/conf.d/zz-pixelfed.ini > /dev/null <<'EOF'
 ffi.enable=true
 EOF
 
-# Caddy 2.11 caps request headers at 16KiB and returns 431 above that. Raise the
-# limit so large cookies don't break requests, while staying well under the old 1MB.
-COPY docker/frankenphp/caddyfile-global.d/max-header-size.caddyfile /etc/frankenphp/caddyfile-global.d/max-header-size.caddyfile
-
 COPY --from=ffmpeg /usr/local/ffmpeg/bin/ffmpeg /usr/bin/ffmpeg
 COPY --from=ffmpeg /usr/local/ffmpeg/bin/ffprobe /usr/bin/ffprobe
 COPY --from=ffmpeg /usr/local/ffmpeg/lib /usr/local/lib

bootstrap/app.php

@@ -69,7 +69,6 @@ return Application::configure(basePath: dirname(__DIR__))
         },
         channels: __DIR__.'/../routes/channels.php',
         commands: __DIR__.'/../routes/console.php',
-        health: '/up',
     )
     ->withMiddleware(function (Middleware $middleware) {
         $middleware->use([

docker-compose.yml

@@ -62,8 +62,6 @@ services:
       PHP_POST_MAX_SIZE: "500M"
       PHP_UPLOAD_MAX_FILE_SIZE: "500M"
       PHP_OPCACHE_ENABLE: "1"
-      PHP_OPCACHE_VALIDATE_TIMESTAMPS: "0"
-      HEALTHCHECK_PATH: "/up"
       
       # Laravel Auto-run Configuration
       AUTORUN_ENABLED: "true"
@@ -74,17 +72,12 @@ services:
       AUTORUN_LARAVEL_ROUTE_CACHE: "true"
       AUTORUN_LARAVEL_VIEW_CACHE: "true"
       AUTORUN_LARAVEL_CONFIG_CACHE: "true"
+
     volumes:
       - ./storage:/var/www/html/storage
     depends_on:
       - db
       - redis
-    healthcheck:
-      test: ["CMD", "healthcheck-frankenphp"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-      start_period: 30s
     networks:
       - pixelfed-network
 
@@ -98,12 +91,6 @@ services:
     env_file:
       - .env
     environment:
-      # PHP Configuration
-      PHP_POST_MAX_SIZE: "500M"
-      PHP_UPLOAD_MAX_FILE_SIZE: "500M"
-      PHP_OPCACHE_ENABLE: "1"
-      PHP_OPCACHE_VALIDATE_TIMESTAMPS: "0"
-      
       # Laravel Auto-run Configuration
       AUTORUN_ENABLED: "false"
       AUTORUN_LARAVEL_MIGRATION: "false"
@@ -113,13 +100,16 @@ services:
       AUTORUN_LARAVEL_ROUTE_CACHE: "false"
       AUTORUN_LARAVEL_VIEW_CACHE: "false"
       AUTORUN_LARAVEL_CONFIG_CACHE: "true"
+      PHP_POST_MAX_SIZE: "500M"
+      PHP_UPLOAD_MAX_FILE_SIZE: "500M"
+      PHP_OPCACHE_ENABLE: "1"
     volumes:
       - ./storage:/var/www/html/storage
     depends_on:
       - db
       - redis
     healthcheck:
-      test: ["CMD", "healthcheck-horizon"]
+      test: ["CMD", "php", "artisan", "horizon:status"]
       interval: 10s
       timeout: 5s
       retries: 3
@@ -137,12 +127,6 @@ services:
     env_file:
       - .env
     environment:
-      # PHP Configuration
-      PHP_POST_MAX_SIZE: "500M"
-      PHP_UPLOAD_MAX_FILE_SIZE: "500M"
-      PHP_OPCACHE_ENABLE: "1"
-      PHP_OPCACHE_VALIDATE_TIMESTAMPS: "0"
-      
       # Laravel Auto-run Configuration
       AUTORUN_ENABLED: "false"
       AUTORUN_LARAVEL_MIGRATION: "false"
@@ -152,6 +136,9 @@ services:
       AUTORUN_LARAVEL_ROUTE_CACHE: "false"
       AUTORUN_LARAVEL_VIEW_CACHE: "false"
       AUTORUN_LARAVEL_CONFIG_CACHE: "true"
+      PHP_POST_MAX_SIZE: "500M"
+      PHP_UPLOAD_MAX_FILE_SIZE: "500M"
+      PHP_OPCACHE_ENABLE: "1"
     volumes:
       - ./storage:/var/www/html/storage
     depends_on:
@@ -159,9 +146,6 @@ services:
       - redis
     healthcheck:
       test: ["CMD", "healthcheck-schedule"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
       start_period: 10s
     networks:
       - pixelfed-network

docker/frankenphp/caddyfile-global.d/max-header-size.caddyfile

@@ -1,3 +0,0 @@
-servers {
-	max_header_size 128KiB
-}