From 3f67f43781e08558402ac4dcf129ef160b9f4bdb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 7 May 2026 10:05:13 +0000 Subject: [PATCH 1/2] Initial plan From 122f69f539b13dcdd44581bc196573f4fbab59a5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 7 May 2026 10:18:51 +0000 Subject: [PATCH 2/2] fix(lychee,snipe-it): repair builds against Ubuntu 26.04 / PHP 8.5 base - lychee: Ubuntu 26.04 ships ImageMagick 7; policy.xml moved from /etc/ImageMagick-6/ to /etc/ImageMagick-7/. Update sed target path so the PDF coder policy injection succeeds. - snipe-it: Upstream snipe-it v8.4.1 composer.lock pins several deps (lcobucci/jwt 5.5.0, nette/schema 1.3.2, phpspec/prophecy 1.22.0) with a php upper bound of ~8.4.0. Resolute's php8.5 trips the platform check. Pass --ignore-platform-req=php to install the locked dep set unchanged on PHP 8.5. Both fixes are scoped to apps// only. Validated with `docker buildx bake --print` and full local image-local builds. Refs https://github.com/trueforge-org/containerforge/actions/runs/25486727136 Agent-Logs-Url: https://github.com/trueforge-org/containerforge/sessions/cfb3fc2d-3a3d-4657-bf0c-71cb75042d92 Co-authored-by: Crow-Control <7613738+Crow-Control@users.noreply.github.com> --- apps/lychee/Dockerfile | 2 +- apps/snipe-it/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/lychee/Dockerfile b/apps/lychee/Dockerfile index 997f92e0b..d1d5b0ffa 100644 --- a/apps/lychee/Dockerfile +++ b/apps/lychee/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update && \ curl && \ rm -rf /var/lib/apt/lists/* && \ echo "**** configure imagemagick policy ****" && \ - sed -i '/<\/policymap>/i \ ' /etc/ImageMagick-6/policy.xml && \ + sed -i '/<\/policymap>/i \ ' /etc/ImageMagick-7/policy.xml && \ echo "**** install composer ****" && \ curl -sS https://getcomposer.org/installer | php8.5 -- --install-dir=/usr/local/bin --filename=composer && \ update-alternatives --set php /usr/bin/php8.5 diff --git a/apps/snipe-it/Dockerfile b/apps/snipe-it/Dockerfile index 16f8a62a1..cb73deec7 100644 --- a/apps/snipe-it/Dockerfile +++ b/apps/snipe-it/Dockerfile @@ -36,7 +36,7 @@ RUN \ /tmp/snipeit.tar.gz -C \ /app/www/ --strip-components=1 && \ cp /app/www/docker/docker.env /app/www/.env && \ - composer install --no-dev -d /app/www && \ + composer install --no-dev --ignore-platform-req=php -d /app/www && \ echo "**** move storage directories to defaults ****" && \ mkdir -p /defaults && \ mv \