extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2024-11-22 07:23:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-1790_cursors' into 'develop'

Browse Source 
KASM-1790 cursors KASM-1512 framestats 2

Closes KASM-1790

See merge request kasm-technologies/internal/workspaces-core-images!10
This commit is contained in:
Justin Travis 2021-08-12 20:47:59 +00:00
commit b5cf973c59
9 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dockerfile-kasm-core
View File

@ -98,6 +98,10 @@ RUN bash $INST_SCRIPTS/audio/install_audio.sh && rm -rf $INST_SCRIPTS/audio/
COPY ./src/ubuntu/install/audio_input $INST_SCRIPTS/audio_input/
RUN bash $INST_SCRIPTS/audio_input/install_audio_input.sh && rm -rf $INST_SCRIPTS/audio_input/
### Install custom cursors
COPY ./src/ubuntu/install/cursors $INST_SCRIPTS/cursors/
RUN bash $INST_SCRIPTS/cursors/install_cursors.sh && rm -rf $INST_SCRIPTS/cursors/
### Copy built Squid
COPY --from=squid_builder /usr/local/squid /usr/local/squid

3
dockerfile-kasm-core-centos
View File

@ -91,6 +91,9 @@ RUN bash $INST_SCRIPTS/kasm_vnc/install_kasm_vnc.sh && rm -rf $INST_SCRIPTS/kasm
COPY ./src/ubuntu/install/kasm_upload_server $INST_SCRIPTS/kasm_upload_server/
RUN bash $INST_SCRIPTS/kasm_upload_server/install_kasm_upload_server.sh && rm -rf $INST_SCRIPTS/kasm_upload_server/
### Install custom cursors
COPY ./src/ubuntu/install/cursors $INST_SCRIPTS/cursors/
RUN bash $INST_SCRIPTS/cursors/install_cursors.sh && rm -rf $INST_SCRIPTS/cursors/
### Install Audio
COPY ./src/ubuntu/install/audio $INST_SCRIPTS/audio/

38
src/centos/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml Normal file
View File

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<channel name="xsettings" version="1.0">
<property name="Net" type="empty">
<property name="ThemeName" type="empty"/>
<property name="IconThemeName" type="empty"/>
<property name="DoubleClickTime" type="empty"/>
<property name="DoubleClickDistance" type="empty"/>
<property name="DndDragThreshold" type="empty"/>
<property name="CursorBlink" type="empty"/>
<property name="CursorBlinkTime" type="empty"/>
<property name="SoundThemeName" type="empty"/>
<property name="EnableEventSounds" type="empty"/>
<property name="EnableInputFeedbackSounds" type="empty"/>
</property>
<property name="Xft" type="empty">
<property name="DPI" type="empty"/>
<property name="Antialias" type="empty"/>
<property name="Hinting" type="empty"/>
<property name="HintStyle" type="empty"/>
<property name="RGBA" type="empty"/>
</property>
<property name="Gtk" type="empty">
<property name="CanChangeAccels" type="empty"/>
<property name="ColorPalette" type="empty"/>
<property name="FontName" type="empty"/>
<property name="IconSizes" type="empty"/>
<property name="KeyThemeName" type="empty"/>
<property name="ToolbarStyle" type="empty"/>
<property name="ToolbarIconSize" type="empty"/>
<property name="MenuImages" type="empty"/>
<property name="ButtonImages" type="empty"/>
<property name="MenuBarAccel" type="empty"/>
<property name="CursorThemeName" type="string" value="bridge"/>
<property name="CursorThemeSize" type="empty"/>
<property name="DecorationLayout" type="empty"/>
</property>
</channel>

BIN
src/ubuntu/install/cursors/cursor-aero.tar.gz Normal file
View File

Binary file not shown.

BIN
src/ubuntu/install/cursors/cursor-bridge.tar.gz Normal file
View File

Binary file not shown.

BIN
src/ubuntu/install/cursors/cursor-capitaine-r4.tar.gz Normal file
View File

Binary file not shown.

9
src/ubuntu/install/cursors/install_cursors.sh Executable file
View File

@ -0,0 +1,9 @@
#!/usr/bin/env bash
set -e
echo "Installing Cursors"
cd $INST_SCRIPTS/cursors
tar -xzf cursor-aero.tar.gz -C /usr/share/icons/
tar -xzf cursor-bridge.tar.gz -C /usr/share/icons/
tar -xzf cursor-capitaine-r4.tar.gz -C /usr/share/icons/

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

@ -6,11 +6,11 @@ cd /tmp
if [ "${DISTRO}" == "kali" ] ;
then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/811e7cde3aed4064a4f8d2c9eb161183c873ffde/kasmvncserver_kali-rolling_0.9.3_master_811e7c_amd64.deb"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/ec6bd697a8785e2f3ed82cafd3b6a4c47fa43491/kasmvncserver_kali-rolling_0.9.3_master_ec6bd6_amd64.deb"
elif [ "${DISTRO}" == "centos" ] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/811e7cde3aed4064a4f8d2c9eb161183c873ffde/kasmvncserver_centos_core_0.9.3_master_811e7c_x86_64.rpm"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/ec6bd697a8785e2f3ed82cafd3b6a4c47fa43491/kasmvncserver_centos_core_0.9.3_master_ec6bd6_x86_64.rpm"
else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/811e7cde3aed4064a4f8d2c9eb161183c873ffde/kasmvncserver_bionic_0.9.3_master_811e7c_amd64.deb"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/ec6bd697a8785e2f3ed82cafd3b6a4c47fa43491/kasmvncserver_bionic_0.9.3_master_ec6bd6_amd64.deb"
fi

2
src/ubuntu/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
View File

@ -30,7 +30,7 @@
<property name="MenuImages" type="empty"/>
<property name="ButtonImages" type="empty"/>
<property name="MenuBarAccel" type="empty"/>
<property name="CursorThemeName" type="empty"/>
<property name="CursorThemeName" type="string" value="bridge"/>
<property name="CursorThemeSize" type="empty"/>
<property name="DecorationLayout" type="empty"/>
</property>