From a198b44f8b082140b0ef85a1482481fd7759d365 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Mon, 24 Mar 2025 13:26:38 +0000 Subject: [PATCH 1/4] KASM-7083 kasmvnc 1.3.4 --- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index 6d4a354..490a85c 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -17,8 +17,8 @@ echo "Install KasmVNC server" cd /tmp BUILD_ARCH=$(uname -p) UBUNTU_CODENAME="" -COMMIT_ID="5ea11df3c02343f44533f7a44be3b97b9b9471fb" -BRANCH="master" # just use 'release' for a release branch +COMMIT_ID="e647af5e281735d1c7fc676ca089201aeae7130a" +BRANCH="release" # just use 'release' for a release branch KASMVNC_VER="1.3.4" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) From 81cb2f4650958b63d7554305e815c050e88e788f Mon Sep 17 00:00:00 2001 From: Jonathan Rich Date: Wed, 26 Mar 2025 16:37:32 -0400 Subject: [PATCH 2/4] update kasmvnc alpine to pull apks --- .../install/kasm_vnc/install_kasm_vnc.sh | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index 490a85c..c6a0b51 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -104,33 +104,27 @@ elif [[ "${DISTRO}" = @(debian|parrotos6) ]] ; then elif [[ "${DISTRO}" == "alpine" ]] ; then if grep -q v3.21 /etc/os-release; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_321/kasmvnc.alpine_321_x86_64.tgz" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_321_${KASM_VER_NAME_PART}_x86_64.apk" else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_321/kasmvnc.alpine_321_aarch64.tgz" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_321_${KASM_VER_NAME_PART}_aarch64.apk" fi elif grep -q v3.20 /etc/os-release; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_320/kasmvnc.alpine_320_x86_64.tgz" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_320_${KASM_VER_NAME_PART}_x86_64.apk" else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_320/kasmvnc.alpine_320_aarch64.tgz" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_320_${KASM_VER_NAME_PART}_aarch64.apk" fi elif grep -q v3.19 /etc/os-release; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_319/kasmvnc.alpine_319_x86_64.tgz" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_319_${KASM_VER_NAME_PART}_x86_64.apk" else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_319/kasmvnc.alpine_319_aarch64.tgz" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_319_${KASM_VER_NAME_PART}_aarch64.apk" fi elif grep -q v3.18 /etc/os-release; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_318/kasmvnc.alpine_318_x86_64.tgz" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_318_${KASM_VER_NAME_PART}_x86_64.apk" else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_318/kasmvnc.alpine_318_aarch64.tgz" - fi - else - if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_317/kasmvnc.alpine_317_x86_64.tgz" - else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_317/kasmvnc.alpine_317_aarch64.tgz" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_318_${KASM_VER_NAME_PART}_aarch64.apk" fi fi else @@ -210,10 +204,12 @@ elif [[ "${DISTRO}" == "alpine" ]] ; then if [ "${BUILD_ARCH}" == "x86_64" ]; then apk add --no-cache xf86-video-intel fi - curl -s "${BUILD_URL}" | tar xzvf - -C / + wget "${BUILD_URL}" -O kasmvncserver.apk + apk add --no-cache --allow-untrusted kasmvncserver.apk ln -s /usr/local/share/kasmvnc /usr/share/kasmvnc ln -s /usr/local/etc/kasmvnc /etc/kasmvnc ln -s /usr/local/lib/kasmvnc /usr/lib/kasmvncserver + rm -f kasmvncserver.apk else wget "${BUILD_URL}" -O kasmvncserver.deb apt-get update From dcc83f6d204ad740a03283f5944896aa9e706000 Mon Sep 17 00:00:00 2001 From: Jonathan Rich Date: Wed, 26 Mar 2025 16:47:56 -0400 Subject: [PATCH 3/4] remove alpine 3.17 --- ci-scripts/template-vars.yaml | 14 -------------- dockerfile-kasm-core-alpine | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index 74ff402..07de763 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -306,20 +306,6 @@ multiImages: - src/ubuntu/sysbox/** - src/ubuntu/virtualgl/** - src/parrotos6/** - - name1: alpine - name2: 317 - base: alpine:3.17 - bg: bg_alpine.png - distro: alpine - dockerfile: dockerfile-kasm-core-alpine - changeFiles: - - dockerfile-kasm-core-alpine - - src/alpine/** - - src/alpine/xfce/** - - src/alpine/xfce/.config/** - - src/alpine/xfce/.config/xfce4/** - - src/alpine/xfce/.config/xfce4/xfconf/** - - src/alpine/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/** - name1: alpine name2: 318 base: alpine:3.18 diff --git a/dockerfile-kasm-core-alpine b/dockerfile-kasm-core-alpine index 2192161..59bf229 100644 --- a/dockerfile-kasm-core-alpine +++ b/dockerfile-kasm-core-alpine @@ -1,5 +1,5 @@ #### Build Stage #### -ARG BASE_IMAGE="alpine:3.17" +ARG BASE_IMAGE="alpine:3.18" FROM $BASE_IMAGE AS install_tools ARG DISTRO=alpine From 3bce8cccf9ab873b018645ae84161a18a1ea3349 Mon Sep 17 00:00:00 2001 From: Jonathan Rich Date: Thu, 27 Mar 2025 09:23:12 -0400 Subject: [PATCH 4/4] remove alpine 3.18 --- ci-scripts/template-vars.yaml | 14 -------------- dockerfile-kasm-core-alpine | 2 +- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 6 ------ 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index 07de763..a682637 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -306,20 +306,6 @@ multiImages: - src/ubuntu/sysbox/** - src/ubuntu/virtualgl/** - src/parrotos6/** - - name1: alpine - name2: 318 - base: alpine:3.18 - bg: bg_alpine.png - distro: alpine - dockerfile: dockerfile-kasm-core-alpine - changeFiles: - - dockerfile-kasm-core-alpine - - src/alpine/** - - src/alpine/xfce/** - - src/alpine/xfce/.config/** - - src/alpine/xfce/.config/xfce4/** - - src/alpine/xfce/.config/xfce4/xfconf/** - - src/alpine/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/** - name1: alpine name2: 319 base: alpine:3.19 diff --git a/dockerfile-kasm-core-alpine b/dockerfile-kasm-core-alpine index 59bf229..87b624f 100644 --- a/dockerfile-kasm-core-alpine +++ b/dockerfile-kasm-core-alpine @@ -1,5 +1,5 @@ #### Build Stage #### -ARG BASE_IMAGE="alpine:3.18" +ARG BASE_IMAGE="alpine:3.19" FROM $BASE_IMAGE AS install_tools ARG DISTRO=alpine diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index c6a0b51..75b2a44 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -120,12 +120,6 @@ elif [[ "${DISTRO}" == "alpine" ]] ; then else BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_319_${KASM_VER_NAME_PART}_aarch64.apk" fi - elif grep -q v3.18 /etc/os-release; then - if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_318_${KASM_VER_NAME_PART}_x86_64.apk" - else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_318_${KASM_VER_NAME_PART}_aarch64.apk" - fi fi else UBUNTU_CODENAME=$(grep -Po -m 1 "(?<=_CODENAME=)\w+" /etc/os-release)