Merge branch 'bugfix/KASM-3196_clipboard_1.11.0-rolling' into 'release/1.11.0'

KASM-3196 Fix seamless clipboard client to server

See merge request kasm-technologies/internal/workspaces-core-images!88
This commit is contained in:
Matthew McClaskey 2022-10-19 14:20:01 +00:00
commit ed5eddaf5e
2 changed files with 22 additions and 11 deletions

View File

@ -127,6 +127,8 @@ build_remnux_focal:
build_kali_rolling:
stage: build
allow_failure: true
when: manual
image: ${ORG_NAME}/docker-buildx-private:develop
variables:
BUILD_PLATFORMS: "linux/amd64,linux/arm64"
@ -337,6 +339,8 @@ build_remnux_focal_dev:
build_kali_rolling_dev:
stage: build
allow_failure: true
when: manual
script:
- >
docker build
@ -474,7 +478,7 @@ test_multi_arch_dev:
KASM_IMAGE:
- core-ubuntu-bionic-private
- core-ubuntu-focal-private
- core-kali-rolling-private
#- core-kali-rolling-private
- core-oracle-8-private
- core-opensuse-15-private
- core-ubuntu-jammy-private
@ -532,7 +536,7 @@ manifest_dev:
- KASM_IMAGE:
- core-ubuntu-bionic-private
- core-ubuntu-focal-private
- core-kali-rolling-private
#- core-kali-rolling-private
- core-oracle-8-private
- core-opensuse-15-private
- core-ubuntu-jammy-private
@ -572,7 +576,7 @@ link_tests_multi_arch_dev:
KASM_IMAGE:
- core-ubuntu-bionic-private
- core-ubuntu-focal-private
- core-kali-rolling-private
#- core-kali-rolling-private
- core-oracle-8-private
- core-opensuse-15-private
- core-ubuntu-jammy-private

View File

@ -10,21 +10,28 @@ install_libjpeg_turbo() {
echo "Install KasmVNC server"
cd /tmp
# https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/fdc4a63eda4b0bc77742cf1047434515fdf58d17/kasmvncserver_focal_0.9.3.2_amd64.deb
BUILD_ARCH=$(uname -p)
UBUNTU_CODENAME=""
COMMIT_ID="924329900dd6942a3336992ad7534a640c7e264d"
BRANCH="master"
COMMIT_ID="fdc4a63eda4b0bc77742cf1047434515fdf58d17"
BRANCH="release" # just use 'release' for a release branch
KASMVNC_VER="0.9.3.2"
COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
# Naming scheme is now different between an official release and feature branch
KASM_VER_NAME_PART="${KASMVNC_VER}_${BRANCH}_${COMMIT_ID_SHORT}"
if [[ "${BRANCH}" == "release" ]] ; then
KASM_VER_NAME_PART="${KASMVNC_VER}"
fi
if [ "${DISTRO}" == "kali" ] ;
then
apt-get update
apt-get install -y sgml-base
if [[ "$(arch)" =~ ^x86_64$ ]] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_kali-rolling_0.9.3_${BRANCH}_${COMMIT_ID_SHORT}_amd64.deb"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_kali-rolling_${KASM_VER_NAME_PART}_amd64.deb"
else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_kali-rolling_0.9.3_${BRANCH}_${COMMIT_ID_SHORT}_arm64.deb"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_kali-rolling_${KASM_VER_NAME_PART}_arm64.deb"
fi
elif [[ "${DISTRO}" == @(centos|oracle7) ]] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/centos_core/kasmvncserver-0.9.3~beta-1.el7.x86_64.rpm"
@ -43,11 +50,11 @@ elif [[ "${DISTRO}" == "opensuse" ]] ; then
else
UBUNTU_CODENAME=$(grep -Po -m 1 "(?<=_CODENAME=)\w+" /etc/os-release)
if [[ "${BUILD_ARCH}" =~ ^aarch64$ ]] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_${UBUNTU_CODENAME}_0.9.3_${BRANCH}_${COMMIT_ID_SHORT}_arm64.deb"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_${UBUNTU_CODENAME}_${KASM_VER_NAME_PART}_arm64.deb"
elif [ "${UBUNTU_CODENAME}" == "bionic" ] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_${UBUNTU_CODENAME}_0.9.3_${BRANCH}_${COMMIT_ID_SHORT}_libjpeg-turbo-latest_amd64.deb"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_${UBUNTU_CODENAME}_${KASM_VER_NAME_PART}_libjpeg-turbo-latest_amd64.deb"
else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_${UBUNTU_CODENAME}_0.9.3_${BRANCH}_${COMMIT_ID_SHORT}_amd64.deb"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_${UBUNTU_CODENAME}_${KASM_VER_NAME_PART}_amd64.deb"
fi
fi