From 3bce8cccf9ab873b018645ae84161a18a1ea3349 Mon Sep 17 00:00:00 2001 From: Jonathan Rich Date: Thu, 27 Mar 2025 09:23:12 -0400 Subject: [PATCH] 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)