From 0fe56f2c629d19d8bf29340ccd9b98ec4e1467ea Mon Sep 17 00:00:00 2001 From: thespad Date: Wed, 22 Oct 2025 20:44:06 +0100 Subject: [PATCH 1/4] Tweaks for 1.18.0 support --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- README.md | 1 + readme-vars.yml | 1 + root/etc/s6-overlay/s6-rc.d/init-config-kasm/run | 2 +- root/etc/s6-overlay/s6-rc.d/svc-kasm-wizard/run | 6 +++--- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index b649e14..01aac0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -83,7 +83,7 @@ RUN \ 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/1.17.0-images-combined.tar.gz" && \ + "https://kasm-ci.s3.amazonaws.com/1.18.0-images-combined.tar.gz" && \ tar xf \ /tmp/images.tar.gz -C \ / && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d2782b6..5efe1c0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -83,7 +83,7 @@ RUN \ 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/1.17.0-images-combined.tar.gz" && \ + "https://kasm-ci.s3.amazonaws.com/1.18.0-images-combined.tar.gz" && \ tar xf \ /tmp/images.tar.gz -C \ / && \ diff --git a/README.md b/README.md index 77ccbca..2900a0a 100644 --- a/README.md +++ b/README.md @@ -313,6 +313,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **22.10.25:** - Update for 1.18.0 release. * **08.06.25:** - Deprecate develop branch. * **03.06.25:** - Rebase to Ubuntu Noble. Update for 1.17.0 release. * **09.11.24:** - Update base image for 1.16.1 release. diff --git a/readme-vars.yml b/readme-vars.yml index 5614b50..6ce3914 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -126,6 +126,7 @@ init_diagram: | "kasm:latest" <- Base Images # changelog changelogs: + - {date: "22.10.25:", desc: "Update for 1.18.0 release."} - {date: "08.06.25:", desc: "Deprecate develop branch."} - {date: "03.06.25:", desc: "Rebase to Ubuntu Noble. Update for 1.17.0 release."} - {date: "09.11.24:", desc: "Update base image for 1.16.1 release."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run b/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run index 57ac17a..c9fbd4e 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run +++ b/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run @@ -7,7 +7,7 @@ fi # Login to Dockerhub if [[ -n "${DOCKER_HUB_USERNAME}" ]]; then - docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD + docker login --username "${DOCKER_HUB_USERNAME}" --password "${DOCKER_HUB_PASSWORD}" fi # Generate self cert for wizard diff --git a/root/etc/s6-overlay/s6-rc.d/svc-kasm-wizard/run b/root/etc/s6-overlay/s6-rc.d/svc-kasm-wizard/run index c50e440..a3dd2ea 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-kasm-wizard/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-kasm-wizard/run @@ -2,16 +2,16 @@ # Wait for docker to be up while true; do - if [ -S "/var/run/docker.sock" ]; then + if [[ -S "/var/run/docker.sock" ]]; then break fi sleep 1 done # Don't do anything if wizard is disabled -if [ -f "/opt/NO_WIZARD" ]; then +if [[ -f "/opt/NO_WIZARD" ]]; then sleep infinity fi -cd /wizard +cd /wizard || exit 1 /usr/bin/node index.js From 6b9159d5754fecadd3643050c883e8cdfc4c00ce Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 24 Oct 2025 20:54:07 +0100 Subject: [PATCH 2/4] Add workaround for rootless docker --- root/etc/s6-overlay/s6-rc.d/init-config-kasm/run | 3 +++ 1 file changed, 3 insertions(+) diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run b/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run index c9fbd4e..f72dd96 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run +++ b/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run @@ -5,6 +5,9 @@ if [[ ! -d "/opt/docker" ]]; then mkdir -p /opt/docker fi +# Workaround for running in a rootless docker environment +sed -i '/set -e/d' /etc/init.d/docker + # Login to Dockerhub if [[ -n "${DOCKER_HUB_USERNAME}" ]]; then docker login --username "${DOCKER_HUB_USERNAME}" --password "${DOCKER_HUB_PASSWORD}" From fb3f4d0757814773b4289f2406f6ede21a303d9b Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 24 Oct 2025 21:09:46 +0100 Subject: [PATCH 3/4] Use version var in images tarball --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 01aac0c..56321ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -83,7 +83,7 @@ RUN \ 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/1.18.0-images-combined.tar.gz" && \ + "https://kasm-ci.s3.amazonaws.com${KASM_VERSION}-images-combined.tar.gz" && \ tar xf \ /tmp/images.tar.gz -C \ / && \ @@ -104,6 +104,7 @@ RUN \ /wizard/ && \ useradd -u 70 kasm_db && \ useradd kasm && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get remove -y g++ gcc make && \ apt-get -y autoremove && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5efe1c0..23207d6 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -83,7 +83,7 @@ RUN \ 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/1.18.0-images-combined.tar.gz" && \ + "https://kasm-ci.s3.amazonaws.com/${KASM_VERSION}-images-combined.tar.gz" && \ tar xf \ /tmp/images.tar.gz -C \ / && \ @@ -104,6 +104,7 @@ RUN \ /wizard/ && \ useradd -u 70 kasm_db && \ useradd kasm && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get remove -y g++ gcc make && \ apt-get -y autoremove && \ From 0086c812f1ae38f9bfe327e62635433a1588ccd5 Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 24 Oct 2025 21:12:24 +0100 Subject: [PATCH 4/4] Missing slash --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 56321ec..77b4acb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -83,7 +83,7 @@ RUN \ 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${KASM_VERSION}-images-combined.tar.gz" && \ + "https://kasm-ci.s3.amazonaws.com/${KASM_VERSION}-images-combined.tar.gz" && \ tar xf \ /tmp/images.tar.gz -C \ / && \