From e67414f7efcf044ce6143288fd73a4030895476e Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Tue, 29 Nov 2022 17:04:02 +0000 Subject: [PATCH 1/5] KASM-3654 KASM-3648 Official 1.0.0 release of KasmVNC --- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index 94380816..54019043 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -21,9 +21,9 @@ echo "Install KasmVNC server" cd /tmp BUILD_ARCH=$(uname -p) UBUNTU_CODENAME="" -COMMIT_ID="f1630b9ce74272f9a29012879d11b5e85f141491" -BRANCH="master" # just use 'release' for a release branch -KASMVNC_VER="0.9.4" +COMMIT_ID="53a9d11b01048cedef69170310976557e0f203db" +BRANCH="release" # just use 'release' for a release branch +KASMVNC_VER="1.0.0" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) # Naming scheme is now different between an official release and feature branch From bc22f4940f160a08bfda675c8da6d08c5ebbba32 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Thu, 1 Dec 2022 19:52:51 +0000 Subject: [PATCH 2/5] Update src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh --- 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 54019043..34bd2998 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -21,9 +21,9 @@ echo "Install KasmVNC server" cd /tmp BUILD_ARCH=$(uname -p) UBUNTU_CODENAME="" -COMMIT_ID="53a9d11b01048cedef69170310976557e0f203db" +COMMIT_ID="8285ea812d6433af9504fde6b92e18aac6641e57" BRANCH="release" # just use 'release' for a release branch -KASMVNC_VER="1.0.0" +KASMVNC_VER="1.0.1" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) # Naming scheme is now different between an official release and feature branch From 0a9e932f170145c5723a274ec367aa1131a14967 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Sat, 3 Dec 2022 20:07:15 +0000 Subject: [PATCH 3/5] Fix MESA KASM-3688 --- src/ubuntu/install/tools/install_tools.sh | 2 +- src/ubuntu/install/virtualgl/install_virtualgl.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubuntu/install/tools/install_tools.sh b/src/ubuntu/install/tools/install_tools.sh index f9d73220..47c40bea 100644 --- a/src/ubuntu/install/tools/install_tools.sh +++ b/src/ubuntu/install/tools/install_tools.sh @@ -24,6 +24,6 @@ fi if [ "$DISTRO" = "ubuntu" ]; then #update mesa to latest - add-apt-repository ppa:kisak/kisak-mesa + add-apt-repository ppa:kisak/turtle apt full-upgrade -y fi diff --git a/src/ubuntu/install/virtualgl/install_virtualgl.sh b/src/ubuntu/install/virtualgl/install_virtualgl.sh index 7a8e6d56..6a6b571d 100644 --- a/src/ubuntu/install/virtualgl/install_virtualgl.sh +++ b/src/ubuntu/install/virtualgl/install_virtualgl.sh @@ -26,7 +26,7 @@ if [ "$DISTRO" = "ubuntu" ]; then libegl1 libegl1:i386 \ libgles2 libgles2:i386 - add-apt-repository ppa:kisak/kisak-mesa + add-apt-repository ppa:kisak/turtle apt full-upgrade -y dpkg -i $INST_SCRIPTS/virtualgl/virtualgl_*amd64.deb fi From 6eb1097fef6a2c2edc32db6ac312d53ee1f4f7a0 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Mon, 9 Jan 2023 13:16:01 +0000 Subject: [PATCH 4/5] KASM-3735 disable udp --- src/common/install/kasm_vnc/kasmvnc.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/install/kasm_vnc/kasmvnc.yaml b/src/common/install/kasm_vnc/kasmvnc.yaml index d794e043..5ffcb5a3 100644 --- a/src/common/install/kasm_vnc/kasmvnc.yaml +++ b/src/common/install/kasm_vnc/kasmvnc.yaml @@ -2,3 +2,5 @@ network: ssl: pem_certificate: ${HOME}/.vnc/self.pem pem_key: ${HOME}/.vnc/self.pem + udp: + public_ip: 127.0.0.1 \ No newline at end of file From 35a241ce76f615af25b0a7e8c2c15b1747c06a4c Mon Sep 17 00:00:00 2001 From: "ryan.kuba" Date: Fri, 17 Mar 2023 09:50:21 -0700 Subject: [PATCH 5/5] KASM-4150 ensure rhel7 images start with newlines at the end of the config file for kasmvnc --- src/common/install/kasm_vnc/kasmvnc.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/install/kasm_vnc/kasmvnc.yaml b/src/common/install/kasm_vnc/kasmvnc.yaml index 5ffcb5a3..fae8cc2b 100644 --- a/src/common/install/kasm_vnc/kasmvnc.yaml +++ b/src/common/install/kasm_vnc/kasmvnc.yaml @@ -3,4 +3,6 @@ network: pem_certificate: ${HOME}/.vnc/self.pem pem_key: ${HOME}/.vnc/self.pem udp: - public_ip: 127.0.0.1 \ No newline at end of file + public_ip: 127.0.0.1 + +