extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2025-06-25 22:41:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-7083_1.3.4' into 'develop'

Browse Source 
KASM-7083 kasmvnc 1.3.4

Closes KASM-7083

See merge request kasm-technologies/internal/workspaces-core-images!273
This commit is contained in:
Matthew McClaskey 2025-04-01 18:04:14 +00:00
commit f881940c87
3 changed files with 12 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ci-scripts/template-vars.yaml
View File

@ -306,34 +306,6 @@ multiImages:
- src/ubuntu/sysbox/** - src/ubuntu/sysbox/**
- src/ubuntu/virtualgl/** - src/ubuntu/virtualgl/**
- src/parrotos6/** - src/parrotos6/**
- name1: alpine
name2: 317
base: alpine:3.17
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/**
- name1: alpine
name2: 318
base: alpine:3.18
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/**
- name1: alpine - name1: alpine
name2: 319 name2: 319
base: alpine:3.19 base: alpine:3.19

2
dockerfile-kasm-core-alpine
View File

@ -1,5 +1,5 @@
#### Build Stage #### #### Build Stage ####
ARG BASE_IMAGE="alpine:3.17" ARG BASE_IMAGE="alpine:3.19"
FROM $BASE_IMAGE AS install_tools FROM $BASE_IMAGE AS install_tools
ARG DISTRO=alpine ARG DISTRO=alpine

32
src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh
View File

@ -17,8 +17,8 @@ echo "Install KasmVNC server"
cd /tmp cd /tmp
BUILD_ARCH=$(uname -p) BUILD_ARCH=$(uname -p)
UBUNTU_CODENAME="" UBUNTU_CODENAME=""
COMMIT_ID="5ea11df3c02343f44533f7a44be3b97b9b9471fb" COMMIT_ID="e647af5e281735d1c7fc676ca089201aeae7130a"
BRANCH="master" # just use 'release' for a release branch BRANCH="release" # just use 'release' for a release branch
KASMVNC_VER="1.3.4" KASMVNC_VER="1.3.4"
COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
@ -104,33 +104,21 @@ elif [[ "${DISTRO}" = @(debian|parrotos6) ]] ; then
elif [[ "${DISTRO}" == "alpine" ]] ; then elif [[ "${DISTRO}" == "alpine" ]] ; then
if grep -q v3.21 /etc/os-release; then if grep -q v3.21 /etc/os-release; then
if [[ "$(arch)" =~ ^x86_64$ ]] ; 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" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_321_${KASM_VER_NAME_PART}_x86_64.apk"
else else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_321/kasmvnc.alpine_321_aarch64.tgz" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_321_${KASM_VER_NAME_PART}_aarch64.apk"
fi fi
elif grep -q v3.20 /etc/os-release; then elif grep -q v3.20 /etc/os-release; then
if [[ "$(arch)" =~ ^x86_64$ ]] ; 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" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_320_${KASM_VER_NAME_PART}_x86_64.apk"
else else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_320/kasmvnc.alpine_320_aarch64.tgz" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_320_${KASM_VER_NAME_PART}_aarch64.apk"
fi fi
elif grep -q v3.19 /etc/os-release; then elif grep -q v3.19 /etc/os-release; then
if [[ "$(arch)" =~ ^x86_64$ ]] ; 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" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_319_${KASM_VER_NAME_PART}_x86_64.apk"
else else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_319/kasmvnc.alpine_319_aarch64.tgz" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_319_${KASM_VER_NAME_PART}_aarch64.apk"
fi
elif grep -q v3.18 /etc/os-release; then
if [[ "$(arch)" =~ ^x86_64$ ]] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_318/kasmvnc.alpine_318_x86_64.tgz"
else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_318/kasmvnc.alpine_318_aarch64.tgz"
fi
else
if [[ "$(arch)" =~ ^x86_64$ ]] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_317/kasmvnc.alpine_317_x86_64.tgz"
else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/alpine_317/kasmvnc.alpine_317_aarch64.tgz"
fi fi
fi fi
else else
@ -210,10 +198,12 @@ elif [[ "${DISTRO}" == "alpine" ]] ; then
if [ "${BUILD_ARCH}" == "x86_64" ]; then if [ "${BUILD_ARCH}" == "x86_64" ]; then
apk add --no-cache xf86-video-intel apk add --no-cache xf86-video-intel
fi fi
curl -s "${BUILD_URL}" | tar xzvf - -C / wget "${BUILD_URL}" -O kasmvncserver.apk
apk add --no-cache --allow-untrusted kasmvncserver.apk
ln -s /usr/local/share/kasmvnc /usr/share/kasmvnc ln -s /usr/local/share/kasmvnc /usr/share/kasmvnc
ln -s /usr/local/etc/kasmvnc /etc/kasmvnc ln -s /usr/local/etc/kasmvnc /etc/kasmvnc
ln -s /usr/local/lib/kasmvnc /usr/lib/kasmvncserver ln -s /usr/local/lib/kasmvnc /usr/lib/kasmvncserver
rm -f kasmvncserver.apk
else else
wget "${BUILD_URL}" -O kasmvncserver.deb wget "${BUILD_URL}" -O kasmvncserver.deb
apt-get update apt-get update