From e7ab1f02aed362fe855db528da70e6d158f5ec55 Mon Sep 17 00:00:00 2001 From: Ryan Kuba Date: Tue, 4 Jun 2024 18:02:18 +0000 Subject: [PATCH] Resolve KASM-6027 "Feature/ alpine 320" --- ci-scripts/template-vars.yaml | 14 ++++++++++++++ docs/core-alpine-320/README.md | 7 +++++++ docs/core-alpine-320/demo.txt | 9 +++++++++ docs/core-alpine-320/description.txt | 1 + src/ubuntu/install/audio/install_audio.sh | 2 +- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 10 ++++++++-- src/ubuntu/install/printer/install_printer.sh | 1 + .../install/profile_sync/install_profile_sync.sh | 5 ++++- src/ubuntu/install/squid/install/install_squid.sh | 2 +- src/ubuntu/install/xfce/install_xfce_ui.sh | 1 - 10 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 docs/core-alpine-320/README.md create mode 100644 docs/core-alpine-320/demo.txt create mode 100644 docs/core-alpine-320/description.txt diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index 070dc51..831b05d 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -378,6 +378,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: 320 + base: alpine:3.20 + 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-320/README.md b/docs/core-alpine-320/README.md new file mode 100644 index 0000000..e9c0314 --- /dev/null +++ b/docs/core-alpine-320/README.md @@ -0,0 +1,7 @@ +# About This Image + +This image contains a browser-accessible version of Alpine 3.20. + +![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-320/demo.txt b/docs/core-alpine-320/demo.txt new file mode 100644 index 0000000..bbd1f8e --- /dev/null +++ b/docs/core-alpine-320/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-320/description.txt b/docs/core-alpine-320/description.txt new file mode 100644 index 0000000..bedb192 --- /dev/null +++ b/docs/core-alpine-320/description.txt @@ -0,0 +1 @@ +Alpine 3.20 base image for Kasm Workspaces diff --git a/src/ubuntu/install/audio/install_audio.sh b/src/ubuntu/install/audio/install_audio.sh index 686ec55..3cd80fc 100644 --- a/src/ubuntu/install/audio/install_audio.sh +++ b/src/ubuntu/install/audio/install_audio.sh @@ -46,7 +46,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; then + if grep -q v3.19 /etc/os-release || grep -q v3.20 /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 2aa7345..3b83b15 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -17,7 +17,7 @@ echo "Install KasmVNC server" cd /tmp BUILD_ARCH=$(uname -p) UBUNTU_CODENAME="" -COMMIT_ID="511e2ae542e95f5447a0a145bb54ced968e6cfec" +COMMIT_ID="9f7a6b58cedaa8637e9274e428a498e023b0fc2f" BRANCH="master" # just use 'release' for a release branch KASMVNC_VER="1.3.2" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) @@ -96,7 +96,13 @@ elif [[ "${DISTRO}" = @(debian|parrotos6) ]] ; then fi fi elif [[ "${DISTRO}" == "alpine" ]] ; then - if grep -q v3.19 /etc/os-release; then + if 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 + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_320/kasmvnc.alpine_320_aarch64.tgz" + 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" else diff --git a/src/ubuntu/install/printer/install_printer.sh b/src/ubuntu/install/printer/install_printer.sh index d10d079..ceb9b2f 100755 --- a/src/ubuntu/install/printer/install_printer.sh +++ b/src/ubuntu/install/printer/install_printer.sh @@ -13,6 +13,7 @@ elif [ "${DISTRO}" == "opensuse" ]; then elif [ "${DISTRO}" == "alpine" ]; then echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories apk add --no-cache cups cups-client cups-pdf@testing + usermod -a -G lpadmin root else apt-get update apt-get install -y cups cups-client cups-pdf diff --git a/src/ubuntu/install/profile_sync/install_profile_sync.sh b/src/ubuntu/install/profile_sync/install_profile_sync.sh index add709a..0c58bfc 100755 --- a/src/ubuntu/install/profile_sync/install_profile_sync.sh +++ b/src/ubuntu/install/profile_sync/install_profile_sync.sh @@ -48,6 +48,9 @@ handle_other_distros_conversion() { if grep -q 'v3.19' /etc/os-release; then profile_distro="alpine_319" fi + if grep -q 'v3.20' /etc/os-release; then + profile_distro="alpine_320" + fi ;; rockylinux*) profile_distro=$(echo "$profile_distro" | sed -e 's/linux//') @@ -80,7 +83,7 @@ download_and_symlink() { ARCH=$(arch) BRANCH="develop" -COMMIT_ID="a1ffc539ae2c42eda1bcbc5a16e352f241e94a7c" +COMMIT_ID="42424ea385a0d10fa7bb5749e207ee70b2a44ae2" convert_local_distro_to_profile_sync_distro check_distro_is_supported diff --git a/src/ubuntu/install/squid/install/install_squid.sh b/src/ubuntu/install/squid/install/install_squid.sh index fe887c3..db12b9b 100644 --- a/src/ubuntu/install/squid/install/install_squid.sh +++ b/src/ubuntu/install/squid/install/install_squid.sh @@ -51,7 +51,7 @@ elif [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9) ]]; then elif [[ "${DISTRO}" == @(centos|oracle7) ]]; then yum install -y openssl11-libs elif [[ "${DISTRO}" == "alpine" ]]; then - if grep -q v3.19 /etc/os-release; then + if grep -q v3.19 /etc/os-release || grep -q v3.20 /etc/os-release; then apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing openssl1.1-compat else apk add --no-cache openssl1.1-compat diff --git a/src/ubuntu/install/xfce/install_xfce_ui.sh b/src/ubuntu/install/xfce/install_xfce_ui.sh index 3532dff..7b1e1f1 100644 --- a/src/ubuntu/install/xfce/install_xfce_ui.sh +++ b/src/ubuntu/install/xfce/install_xfce_ui.sh @@ -39,7 +39,6 @@ if [ "${DISTRO}" == "kali" ]; then atril \ dbus-x11 \ engrampa \ - kali-debtags \ kali-defaults-desktop \ kali-menu \ kali-themes \