Skip to content

Commit cd2327b

Browse files
Copilotactions-userCrow-Control
authored
fix(ci): release autofix for diskover and kasm on Ubuntu 26.04 base (#2319)
Release build [run 25485774052](https://github.com/trueforge-org/containerforge/actions/runs/25485774052) failed for `diskover` and `kasm` after the shared `python-node` / `ubuntu` base bumped to Ubuntu 26.04 (resolute), which dropped `apt-key` and PHP 8.3, and after upstream Kasm relocated its release tarball. ### `apps/diskover` - `php8.3-cli` / `php8.3-fpm` / `php8.3-sqlite3` no longer exist on the new base — switched to versionless `php-cli` / `php-fpm` / `php-sqlite3` (Ubuntu 26.04 ships PHP 8.5 as default). - Replaced the hardcoded `/etc/php83/...` Alpine-style config path with a glob over `/etc/php/*/fpm/pool.d/www.conf`. - `start.sh` now invokes `php -S` instead of `php8.3 -S`. ### `apps/kasm` - `apt-key` was removed in Ubuntu 26.04 → added Docker's GPG key via `gpg --dearmor` into `/usr/share/keyrings/` and reference it with `signed-by=` in `docker.list`. - `kasm_release_<ver>.tar.gz` is no longer published as a GitHub release asset on `kasmtech/kasm-install-wizard` (404) → switched to the canonical `https://kasm-static-content.s3.amazonaws.com/kasm_release_<ver>.tar.gz` used by upstream's installer. - Dropped the now-dead `kasm-ci.s3 …-images-combined.tar.gz` fetch (Kasm pulls images at runtime in current versions) and the obsolete `www/img/thumbnails` copy + `yq` `proxy.volumes` tweak — neither path exists in the current tarball. No version bumps, no test weakening; both changes are scoped to their respective `apps/<app>/` directories. ### Sandbox-imposed deviation The autofix protocol calls for one PR per app. The Copilot agent token in this sandbox can only push to the pre-existing branch, so both fixes are bundled here as two disjoint Conventional-Commit commits (`apps/diskover/**` and `apps/kasm/Dockerfile`) that can be cherry-picked apart if per-app PRs are preferred. The summary comment for the source issue could also not be posted from the sandbox and is left for a maintainer. --------- Co-authored-by: release-autofix <actions@github.com> Co-authored-by: Crow-Control <7613738+Crow-Control@users.noreply.github.com>
1 parent c4e1fa2 commit cd2327b

3 files changed

Lines changed: 13 additions & 18 deletions

File tree

apps/diskover/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@ RUN \
2222
echo "**** install runtime packages ****" && \
2323
apt-get install -y --no-install-recommends \
2424
ncurses-bin \
25-
php8.3-cli \
25+
php-cli \
2626
php-sqlite3 \
2727
php-fpm \
2828
python3-pip \
2929
python3 \
3030
python3-venv && \
3131
echo "**** configure php-fpm to pass env vars ****" && \
32-
if [ -f /etc/php83/php-fpm.d/www.conf ]; then sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf; fi && \
32+
for f in /etc/php/*/fpm/pool.d/www.conf; do \
33+
[ -f "$f" ] || continue; \
34+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' "$f"; \
35+
grep -qxF 'clear_env = no' "$f" || echo 'clear_env = no' >> "$f"; \
36+
fpmconf="$(dirname "$(dirname "$f")")/php-fpm.conf"; \
37+
[ -f "$fpmconf" ] && echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> "$fpmconf"; \
38+
done && \
3339
echo "**** install diskover ****" && \
3440
if [ -z ${DISKOVER_RELEASE+x} ]; then \
3541
DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/diskoverdata/diskover-community/releases" \

apps/diskover/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ if [ -f "/config/diskover.cfg" ]; then
3838
done
3939
fi
4040

41-
exec php8.3 -S 0.0.0.0:80 -t /app/diskover-web/public
41+
exec php -S 0.0.0.0:80 -t /app/diskover-web/public

apps/kasm/Dockerfile

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility"
1616
# Container setup
1717
RUN \
1818
echo "**** install packages ****" && \
19-
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
20-
echo "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu noble stable" > \
19+
install -d -m 0755 /usr/share/keyrings && \
20+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
21+
echo "deb [arch=$TARGETARCH signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu noble stable" > \
2122
/etc/apt/sources.list.d/docker.list && \
2223
curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg \
2324
&& curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list | \
@@ -72,29 +73,17 @@ RUN \
7273
echo "**** add installer ****" && \
7374
curl -o \
7475
/tmp/kasm.tar.gz -L \
75-
"https://github.com/kasmtech/kasm-install-wizard/releases/download/${VERSION}/kasm_release.tar.gz" && \
76+
"https://kasm-static-content.s3.amazonaws.com/kasm_release_${VERSION}.tar.gz" && \
7677
tar xf \
7778
/tmp/kasm.tar.gz -C \
7879
/ && \
7980
ALVERSION=$(cat /kasm_release/conf/database/seed_data/default_properties.yaml |awk '/alembic_version/ {print $2}') && \
80-
curl -o \
81-
/tmp/images.tar.gz -L \
82-
"https://kasm-ci.s3.amazonaws.com/${VERSION}-images-combined.tar.gz" && \
83-
tar xf \
84-
/tmp/images.tar.gz -C \
85-
/ && \
8681
sed -i \
8782
'/alembic_version/s/.*/alembic_version: '${ALVERSION}'/' \
8883
/kasm_release/conf/database/seed_data/default_images_a* && \
8984
sed -i 's/-N -e -H/-N -B -e -H/g' /kasm_release/upgrade.sh && \
9085
echo "exit 0" > /kasm_release/install_dependencies.sh && \
91-
/kasm_release/bin/utils/yq_$(uname -m) -i \
92-
'.services.proxy.volumes += "/kasm_release/www/img/thumbnails:/srv/www/img/thumbnails"' \
93-
/kasm_release/docker/docker-compose-all.yaml && \
9486
echo "**** copy assets ****" && \
95-
cp \
96-
/kasm_release/www/img/thumbnails/*.png /kasm_release/www/img/thumbnails/*.svg \
97-
/wizard/public/img/thumbnails/ && \
9887
cp \
9988
/kasm_release/conf/database/seed_data/default_images_a* \
10089
/wizard/ && \

0 commit comments

Comments
 (0)