Merge branch 'feature/KASM-5854-ubuntu-noble' into 'develop'

Resolve KASM-5854 "Feature/ ubuntu noble"

Closes KASM-5854

See merge request kasm-technologies/internal/workspaces-core-images!197

ci-scripts/template-vars.yaml

@@ -78,6 +78,23 @@ multiImages:
       - src/ubuntu/nvidia/**
       - src/ubuntu/sysbox/**
       - src/ubuntu/virtualgl/**
+  - name1: ubuntu
+    name2: noble
+    base: ubuntu:24.04
+    bg: bg_noble.png
+    distro: ubuntu
+    dockerfile: dockerfile-kasm-core
+    changeFiles:
+      - dockerfile-kasm-core
+      - src/ubuntu/xfce/**
+      - src/ubuntu/xfce/.config/**
+      - src/ubuntu/xfce/.config/xfce4/**
+      - src/ubuntu/xfce/.config/xfce4/xfconf/**
+      - src/ubuntu/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/**
+      - src/ubuntu/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/**
+      - src/ubuntu/nvidia/**
+      - src/ubuntu/sysbox/**
+      - src/ubuntu/virtualgl/**
   - name1: debian
     name2: bullseye
     base: debian:bullseye-slim

docs/core-ubuntu-noble/README.md

@@ -0,0 +1,7 @@
+# About This Image
+
+This image contains a browser-accessible version of Ubuntu Noble.
+
+![Screenshot][Image_Screenshot]
+
+[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/core-ubuntu-noble.png "Image Screenshot"

docs/core-ubuntu-noble/demo.txt

@@ -0,0 +1,9 @@
+# Live Demo
+
+**Launch a real-time demo in a new browser window:** <a href="https://app.kasmweb.com/#/cast/1481835260" target="_blank">Live Demo</a>.
+
+<a href="https://app.kasmweb.com/#/cast/1481835260" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/CoreUbuntuJammy.png" width="300" height="104"></a>
+
+&lowast;*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.*
+
+&lowast;*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.*

docs/core-ubuntu-noble/description.txt

@@ -0,0 +1 @@
+Ubuntu Noble base image for Kasm Workspaces

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="230e50f7b89663316c70de7b0e3db6f6b9340489"
-BRANCH="release" # just use 'release' for a release branch
-KASMVNC_VER="1.3.1"
+COMMIT_ID="574954611c0e8e77d1365f5f739e641eddb2bcbd"
+BRANCH="master" # just use 'release' for a release branch
+KASMVNC_VER="1.3.2"
 COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
 
 # Naming scheme is now different between an official release and feature branch

src/ubuntu/install/profile_sync/install_profile_sync.sh

@@ -79,8 +79,8 @@ download_and_symlink() {
 }
 
 ARCH=$(arch)
-BRANCH="release_1.0.4"
-COMMIT_ID="ce08b72955459c61f27ce5015547fab9b25842d4"
+BRANCH="develop"
+COMMIT_ID="a72c9f215b328348e9703ad4336eefbba9806113"
 
 convert_local_distro_to_profile_sync_distro
 check_distro_is_supported

src/ubuntu/install/squid/install/install_squid.sh

@@ -47,7 +47,7 @@ elif [[ "${DISTRO}" == "alpine" ]]; then
   else
     apk add --no-cache openssl1.1-compat
   fi
-elif grep -q bookworm /etc/os-release; then
+elif grep -q bookworm /etc/os-release || grep -q noble /etc/os-release; then
   wget ${LIBSSLURL} -O libssl1.1.${ARCH}.deb
   dpkg -i libssl1.1.${ARCH}.deb
   rm -f libssl1.1.${ARCH}.deb

src/ubuntu/install/tools/install_tools.sh

@@ -39,7 +39,7 @@ else
   locale-gen en_US.UTF-8
 fi
 
-if [ "$DISTRO" = "ubuntu" ]; then
+if [ "$DISTRO" = "ubuntu" ] && ! grep -q "24.04" /etc/os-release; then
   #update mesa to latest
   add-apt-repository ppa:kisak/turtle
   apt-get update

src/ubuntu/install/virtualgl/install_virtualgl.sh

@@ -26,8 +26,10 @@ if [ "$DISTRO" = "ubuntu" ]; then
         libegl1 libegl1:i386 \
         libgles2 libgles2:i386
 
-    add-apt-repository ppa:kisak/turtle
-    apt full-upgrade -y
+    if ! grep -q "24.04" /etc/os-release; then
+      add-apt-repository ppa:kisak/turtle
+      apt full-upgrade -y
+    fi
     dpkg -i $INST_SCRIPTS/virtualgl/virtualgl_*amd64.deb
   fi