diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index 6edcdaf..f48b7fb 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -365,6 +365,20 @@ multiImages: - src/alpine/xfce/.config/xfce4/** - src/alpine/xfce/.config/xfce4/xfconf/** - src/alpine/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/** + - name1: alpine + name2: 321 + base: alpine:3.21 + 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/** singleImages: - name1: cuda name2: focal diff --git a/docs/core-alpine-321/README.md b/docs/core-alpine-321/README.md new file mode 100644 index 0000000..492765b --- /dev/null +++ b/docs/core-alpine-321/README.md @@ -0,0 +1,7 @@ +# About This Image + +This image contains a browser-accessible version of Alpine 3.21. + +![Screenshot][Image_Screenshot] + +[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/alpine-317-core.png "Image Screenshot" diff --git a/docs/core-alpine-321/demo.txt b/docs/core-alpine-321/demo.txt new file mode 100644 index 0000000..bbd1f8e --- /dev/null +++ b/docs/core-alpine-321/demo.txt @@ -0,0 +1,9 @@ +# Live Demo + +**Launch a real-time demo in a new browser window:** Live Demo. + + + +∗*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.* + +∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-alpine-321/description.txt b/docs/core-alpine-321/description.txt new file mode 100644 index 0000000..d860bfe --- /dev/null +++ b/docs/core-alpine-321/description.txt @@ -0,0 +1 @@ +Alpine 3.21 base image for Kasm Workspaces diff --git a/src/ubuntu/install/audio/install_audio.sh b/src/ubuntu/install/audio/install_audio.sh index 25f0a12..9e231db 100644 --- a/src/ubuntu/install/audio/install_audio.sh +++ b/src/ubuntu/install/audio/install_audio.sh @@ -48,7 +48,7 @@ elif [ "${DISTRO}" == "opensuse" ]; then zypper install -ny curl git zypper install -yn ffmpeg pulseaudio-utils elif [ "${DISTRO}" == "alpine" ]; then - if grep -q v3.19 /etc/os-release || grep -q v3.20 /etc/os-release; then + if grep -q v3.19 /etc/os-release || grep -q v3.20 /etc/os-release || grep -q v3.21 /etc/os-release; then apk add --no-cache \ ffmpeg \ ffplay \ diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index dd8d83e..ea2af3e 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -17,9 +17,9 @@ echo "Install KasmVNC server" cd /tmp BUILD_ARCH=$(uname -p) UBUNTU_CODENAME="" -COMMIT_ID="0ebbbc6412e131092308cc1ce10b9d106e3b4e05" -BRANCH="release" # just use 'release' for a release branch -KASMVNC_VER="1.3.3" +COMMIT_ID="e04731870baebd2784983fb48197a2416c7d3519" +BRANCH="master" # just use 'release' for a release branch +KASMVNC_VER="1.3.4" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) # Naming scheme is now different between an official release and feature branch @@ -96,7 +96,13 @@ elif [[ "${DISTRO}" = @(debian|parrotos6) ]] ; then fi fi elif [[ "${DISTRO}" == "alpine" ]] ; then - if grep -q v3.20 /etc/os-release; 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" + else + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_321/kasmvnc.alpine_321_aarch64.tgz" + 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" else diff --git a/src/ubuntu/install/profile_sync/install_profile_sync.sh b/src/ubuntu/install/profile_sync/install_profile_sync.sh index f3271ca..36e6321 100755 --- a/src/ubuntu/install/profile_sync/install_profile_sync.sh +++ b/src/ubuntu/install/profile_sync/install_profile_sync.sh @@ -51,6 +51,9 @@ handle_other_distros_conversion() { if grep -q 'v3.20' /etc/os-release; then profile_distro="alpine_320" fi + if grep -q 'v3.21' /etc/os-release; then + profile_distro="alpine_321" + fi ;; rockylinux*) profile_distro=$(echo "$profile_distro" | sed -e 's/linux//') @@ -86,7 +89,7 @@ download_and_symlink() { ARCH=$(arch) BRANCH="develop" -COMMIT_ID="42424ea385a0d10fa7bb5749e207ee70b2a44ae2" +COMMIT_ID="9b62027aaf2046454b572d7257070aaac9cd8cac" convert_local_distro_to_profile_sync_distro check_distro_is_supported