From 95050c062d754961a57af6a67069bddbc8853421 Mon Sep 17 00:00:00 2001 From: Richard Koliser Date: Thu, 16 Apr 2026 16:41:23 -0400 Subject: [PATCH 1/3] update for new instaol wizard and noble --- Dockerfile | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b1f679..b44a3fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy +FROM ubuntu:noble # Settings ARG OVERLAY_VERSION="v2.2.0.3" @@ -15,11 +15,11 @@ RUN \ gnupg && \ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ ARCH=$(uname -m | sed 's/x86_64/amd64/g' |sed 's/aarch64/arm64/g') && \ - echo "deb [arch=${ARCH}] https://download.docker.com/linux/ubuntu jammy stable" > \ + echo "deb [arch=${ARCH}] 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/ubuntu22.04/libnvidia-container.list | \ + curl -s -L https://nvidia.github.io/libnvidia-container/ubuntu24.04/libnvidia-container.list | \ sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \ tee /etc/apt/sources.list.d/nvidia-container-toolkit.list && \ curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ @@ -71,9 +71,6 @@ RUN \ /tmp/s6-overlay-installer / && \ echo "**** setup wizard ****" && \ mkdir -p /wizard && \ - if [ "${RELEASE_TYPE}" = "develop" ]; then \ - KASM_VERSION=$(curl -sX GET https://kasm-ci.s3.amazonaws.com/dev-version.txt); \ - fi; \ if [ "${RELEASE_TYPE}" = "stable" ]; then \ KASM_VERSION=$(curl -sX GET 'https://api.github.com/repos/kasmtech/kasm-install-wizard/releases/latest' \ | jq -r '.name'); \ @@ -90,29 +87,30 @@ RUN \ echo "**** add installer ****" && \ curl -o \ /tmp/kasm.tar.gz -L \ - "https://github.com/kasmtech/kasm-install-wizard/releases/download/${KASM_VERSION}/kasm_release.tar.gz" && \ + "https://kasm-static-content.s3.amazonaws.com/kasm_release_${KASM_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.us-east-1.amazonaws.com/1.18.0-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 && \ - 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/ && \ + # Set dependencies + /kasm_release/bin/utils/yq_$(uname -m) -i \ + '.services.proxy.depends_on = {"kasm_manager":{"condition": "service_healthy"},"kasm_api":{"condition": "service_healthy"},"kasm_agent":{"condition": "service_started"},"kasm_guac":{"condition": "service_started"}}' \ + /kasm_release/docker/docker-compose-all.yaml && \ + /kasm_release/bin/utils/yq_$(uname -m) -i \ + '.services.kasm_manager.depends_on = {"db":{"condition": "service_healthy"}}' \ + /kasm_release/docker/docker-compose-all.yaml && \ + /kasm_release/bin/utils/yq_$(uname -m) -i \ + '.services.kasm_api.depends_on = {"db":{"condition": "service_healthy"}}' \ + /kasm_release/docker/docker-compose-all.yaml && \ + /kasm_release/bin/utils/yq_$(uname -m) -i \ + '.services.kasm_api.healthcheck += {"start_period": "60s","start_interval": "30s"}' \ + /kasm_release/docker/docker-compose-all.yaml && \ + /kasm_release/bin/utils/yq_$(uname -m) -i \ + '.services.kasm_rdp_https_gateway.depends_on = {"proxy":{"condition": "service_started"}}' \ + /kasm_release/docker/docker-compose-all.yaml && \ + useradd -u 70 kasm_db && \ + useradd kasm && \ echo "**** cleanup ****" && \ apt-get remove -y g++ gcc make && \ apt-get -y autoremove && \ From b8e3394c6cc92e92144709c036b5de84167dfba5 Mon Sep 17 00:00:00 2001 From: Richard Koliser Date: Thu, 16 Apr 2026 16:59:54 -0400 Subject: [PATCH 2/3] more updates --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b44a3fc..1a8506e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,10 +19,10 @@ RUN \ /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/ubuntu24.04/libnvidia-container.list | \ + curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list | \ sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \ tee /etc/apt/sources.list.d/nvidia-container-toolkit.list && \ - curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ + curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \ apt-get install -y --no-install-recommends \ bash \ btrfs-progs \ From 0d45defdbd042c8fda457b185f936730685fa273 Mon Sep 17 00:00:00 2001 From: Richard Koliser Date: Thu, 16 Apr 2026 17:26:42 -0400 Subject: [PATCH 3/3] Fix docker dind version --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b945eb..bdfe0ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ -image: docker +image: docker:28.2.2 services: - - docker:dind + - docker:28.2.2-dind stages: - build