Merge branch 'feature/KASM-5078_multi-monitor' into 'develop'

Resolve KASM-5078 "Feature/ multi monitor"

Closes KASM-5078

See merge request kasm-technologies/internal/workspaces-core-images!149
This commit is contained in:
Richard Koliser 2023-12-20 00:11:19 +00:00
commit 912465279d
2 changed files with 2 additions and 1 deletions

View File

@ -56,6 +56,7 @@ ADD /src/common/resources/images/$BG_IMG /usr/share/extra/backgrounds/bg_defaul
ADD /src/common/resources/images/icon_ubuntu.png /usr/share/extra/icons/icon_ubuntu.png ADD /src/common/resources/images/icon_ubuntu.png /usr/share/extra/icons/icon_ubuntu.png
ADD /src/common/resources/images/icon_ubuntu.png /usr/share/extra/icons/icon_default.png ADD /src/common/resources/images/icon_ubuntu.png /usr/share/extra/icons/icon_default.png
ADD /src/common/resources/images/icon_kasm.png /usr/share/extra/icons/icon_kasm.png ADD /src/common/resources/images/icon_kasm.png /usr/share/extra/icons/icon_kasm.png
RUN cp /usr/share/extra/backgrounds/bg_default.png /usr/share/backgrounds/xfce/xfce-stripes.png
### Install kasm_vnc dependencies and binaries ### Install kasm_vnc dependencies and binaries
COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/ COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/

View File

@ -17,7 +17,7 @@ echo "Install KasmVNC server"
cd /tmp cd /tmp
BUILD_ARCH=$(uname -p) BUILD_ARCH=$(uname -p)
UBUNTU_CODENAME="" UBUNTU_CODENAME=""
COMMIT_ID="21d2ae50184c60b51ada144044203831ef6a5115" COMMIT_ID="4114d73ed67c483012129a800b116195c03e850f"
BRANCH="master" # just use 'release' for a release branch BRANCH="master" # just use 'release' for a release branch
KASMVNC_VER="1.2.1" KASMVNC_VER="1.2.1"
COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)