Skip to content

fix(ci): release autofix for diskover and kasm on Ubuntu 26.04 base #2319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Crow-Control merged 2 commits into from
May 7, 2026
Merged

fix(ci): release autofix for diskover and kasm on Ubuntu 26.04 base #2319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f6a537
fix(diskover): use Ubuntu default php packages (php-cli/php-fpm) for …
actions-user May 7, 2026
04c3ac6
fix(kasm): replace removed apt-key, fix kasm_release URL, drop missin…
actions-user May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions apps/diskover/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,20 @@ RUN \
echo "**** install runtime packages ****" && \
apt-get install -y --no-install-recommends \
ncurses-bin \
php8.3-cli \
php-cli \
php-sqlite3 \
php-fpm \
python3-pip \
python3 \
python3-venv && \
echo "**** configure php-fpm to pass env vars ****" && \
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 && \
for f in /etc/php/*/fpm/pool.d/www.conf; do \
[ -f "$f" ] || continue; \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' "$f"; \
grep -qxF 'clear_env = no' "$f" || echo 'clear_env = no' >> "$f"; \
fpmconf="$(dirname "$(dirname "$f")")/php-fpm.conf"; \
[ -f "$fpmconf" ] && echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> "$fpmconf"; \
done && \
echo "**** install diskover ****" && \
if [ -z ${DISKOVER_RELEASE+x} ]; then \
DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/diskoverdata/diskover-community/releases" \
Expand Down
2 changes: 1 addition & 1 deletion apps/diskover/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ if [ -f "/config/diskover.cfg" ]; then
done
fi

exec php8.3 -S 0.0.0.0:80 -t /app/diskover-web/public
exec php -S 0.0.0.0:80 -t /app/diskover-web/public
19 changes: 4 additions & 15 deletions apps/kasm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility"
# Container setup
RUN \
echo "**** install packages ****" && \
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
echo "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu noble stable" > \
install -d -m 0755 /usr/share/keyrings && \
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
echo "deb [arch=$TARGETARCH signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu noble stable" > \
/etc/apt/sources.list.d/docker.list && \
curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg \
&& curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list | \
Expand Down Expand Up @@ -72,29 +73,17 @@ RUN \
echo "**** add installer ****" && \
curl -o \
/tmp/kasm.tar.gz -L \
"https://github.com/kasmtech/kasm-install-wizard/releases/download/${VERSION}/kasm_release.tar.gz" && \
"https://kasm-static-content.s3.amazonaws.com/kasm_release_${VERSION}.tar.gz" && \
tar xf \
/tmp/kasm.tar.gz -C \
/ && \
ALVERSION=$(cat /kasm_release/conf/database/seed_data/default_properties.yaml |awk '/alembic_version/ {print $2}') && \
curl -o \
/tmp/images.tar.gz -L \
"https://kasm-ci.s3.amazonaws.com/${VERSION}-images-combined.tar.gz" && \
tar xf \
/tmp/images.tar.gz -C \
/ && \
sed -i \
'/alembic_version/s/.*/alembic_version: '${ALVERSION}'/' \
/kasm_release/conf/database/seed_data/default_images_a* && \
sed -i 's/-N -e -H/-N -B -e -H/g' /kasm_release/upgrade.sh && \
echo "exit 0" > /kasm_release/install_dependencies.sh && \
/kasm_release/bin/utils/yq_$(uname -m) -i \
'.services.proxy.volumes += "/kasm_release/www/img/thumbnails:/srv/www/img/thumbnails"' \
/kasm_release/docker/docker-compose-all.yaml && \
echo "**** copy assets ****" && \
cp \
/kasm_release/www/img/thumbnails/*.png /kasm_release/www/img/thumbnails/*.svg \
/wizard/public/img/thumbnails/ && \
cp \
/kasm_release/conf/database/seed_data/default_images_a* \
/wizard/ && \
Expand Down
Loading