From a731f9ea1064cd4844663cf1f08de5b4adeea9e1 Mon Sep 17 00:00:00 2001 From: Twyco Date: Sat, 22 Aug 2026 09:40:44 +0200 Subject: [PATCH] fix Kubernetes runtime deployment --- .github/workflows/ci_cd.yml | 2 +- Dockerfile | 8 +++++--- bootstrap/app.php | 2 ++ docker/nginx/nginx.conf.template | 6 +++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index a23dd3c..11fd7d4 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -77,7 +77,7 @@ jobs: echo "image=${image}" echo "tag=${tag}" echo "environment=${environment}" - } >> "${GITEA_OUTPUT}" + } >> "${GITHUB_OUTPUT}" - name: Log in to private registry shell: bash diff --git a/Dockerfile b/Dockerfile index 029a937..836cdd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -ARG COMPOSER_IMAGE=composer:2.9.5 -ARG NODE_IMAGE=node:22-bookworm-slim -ARG PHP_IMAGE=php:8.4-fpm-bookworm +ARG COMPOSER_IMAGE=composer:2.9.5@sha256:698d3801b2a622ace460c4743c781282fcbcb733a4cbf8b31c44731e846585e8 +ARG NODE_IMAGE=node:22-bookworm-slim@sha256:d649c27dae7ba0137b3cef5dd75baa422c08dc3d9e3fc0c23dfb172dc3cc6436 +ARG PHP_IMAGE=php:8.4-fpm-bookworm@sha256:c5fb7a0c02f4efe280691910c8b734995fa83598cdcf3115ef5dcb2e4617681c FROM ${COMPOSER_IMAGE} AS composer_binary FROM ${NODE_IMAGE} AS node_binary @@ -92,11 +92,13 @@ RUN chmod +x /usr/local/bin/kanbangit-entrypoint /usr/local/bin/php-fpm-healthch > /usr/local/etc/php-fpm.d/zz-kanbangit.conf \ && mkdir -p \ /var/www/bootstrap/cache \ + /var/www/storage/app/public \ /var/www/storage/framework/cache \ /var/www/storage/framework/sessions \ /var/www/storage/framework/testing \ /var/www/storage/framework/views \ /var/www/storage/logs \ + && ln -s ../storage/app/public /var/www/public/storage \ && chown -R www-data:www-data /var/www/bootstrap/cache /var/www/storage USER www-data diff --git a/bootstrap/app.php b/bootstrap/app.php index 0e344cc..04ad23c 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -17,6 +17,8 @@ return Application::configure(basePath: dirname(__DIR__)) health: '/up', ) ->withMiddleware(function (Middleware $middleware): void { + $middleware->trustProxies(at: '*'); + $middleware->encryptCookies(except: ['appearance', 'sidebar_state']); $middleware->web(append: [ diff --git a/docker/nginx/nginx.conf.template b/docker/nginx/nginx.conf.template index 7820d0f..2c93a11 100644 --- a/docker/nginx/nginx.conf.template +++ b/docker/nginx/nginx.conf.template @@ -37,9 +37,13 @@ http { } location = /index.php { - include fastcgi_params; + include /etc/nginx/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param HTTP_PROXY ''; + fastcgi_param HTTP_X_FORWARDED_FOR $http_x_forwarded_for; + fastcgi_param HTTP_X_FORWARDED_HOST $http_x_forwarded_host; + fastcgi_param HTTP_X_FORWARDED_PORT $http_x_forwarded_port; + fastcgi_param HTTP_X_FORWARDED_PROTO $http_x_forwarded_proto; fastcgi_pass ${PHP_FPM_UPSTREAM}; }