mirror of
https://github.com/kasmtech/workspaces-core-images.git
synced 2025-06-25 22:41:47 +02:00
KASM-6008 Alpine: add Zink support
This commit is contained in:
parent
00c600892d
commit
96c2f2727e
@ -227,6 +227,8 @@ ENV AUDIO_PORT=4901 \
|
|||||||
VNC_VIEW_ONLY_PW=vncviewonlypassword \
|
VNC_VIEW_ONLY_PW=vncviewonlypassword \
|
||||||
TZ=$TZ
|
TZ=$TZ
|
||||||
|
|
||||||
|
RUN apk update && apk add mesa-vulkan-intel vulkan-tools
|
||||||
|
|
||||||
### Ports and user
|
### Ports and user
|
||||||
EXPOSE $VNC_PORT \
|
EXPOSE $VNC_PORT \
|
||||||
$NO_VNC_PORT \
|
$NO_VNC_PORT \
|
||||||
|
@ -198,6 +198,9 @@ function start_window_manager (){
|
|||||||
if [ -f /opt/VirtualGL/bin/vglrun ] && [ ! -z "${KASM_EGL_CARD}" ] && [ ! -z "${KASM_RENDERD}" ] && [ -O "${KASM_RENDERD}" ] && [ -O "${KASM_EGL_CARD}" ] ; then
|
if [ -f /opt/VirtualGL/bin/vglrun ] && [ ! -z "${KASM_EGL_CARD}" ] && [ ! -z "${KASM_RENDERD}" ] && [ -O "${KASM_RENDERD}" ] && [ -O "${KASM_EGL_CARD}" ] ; then
|
||||||
echo "Starting XFCE with VirtualGL using EGL device ${KASM_EGL_CARD}"
|
echo "Starting XFCE with VirtualGL using EGL device ${KASM_EGL_CARD}"
|
||||||
DISPLAY=:1 /opt/VirtualGL/bin/vglrun -d "${KASM_EGL_CARD}" /usr/bin/startxfce4 --replace &
|
DISPLAY=:1 /opt/VirtualGL/bin/vglrun -d "${KASM_EGL_CARD}" /usr/bin/startxfce4 --replace &
|
||||||
|
elif [ -n "$KASM_ENABLE_ZINK" ]; then
|
||||||
|
echo "Starting XFCE with Zink"
|
||||||
|
LIBGL_KOPPER_DRI2=1 MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink DISPLAY=:1 /usr/bin/startxfce4 --replace &
|
||||||
else
|
else
|
||||||
echo "Starting XFCE"
|
echo "Starting XFCE"
|
||||||
DISPLAY=:1 /usr/bin/startxfce4 --replace &
|
DISPLAY=:1 /usr/bin/startxfce4 --replace &
|
||||||
@ -275,14 +278,14 @@ function start_pcm_audio (){
|
|||||||
HOME=/var/run/pulse pulseaudio --start
|
HOME=/var/run/pulse pulseaudio --start
|
||||||
fi
|
fi
|
||||||
/opt/audio/start kasmaudio 4901 ${HOME}/.vnc/self.pem ${HOME}/.vnc/self.pem "kasm_user:$VNC_PW" &
|
/opt/audio/start kasmaudio 4901 ${HOME}/.vnc/self.pem ${HOME}/.vnc/self.pem "kasm_user:$VNC_PW" &
|
||||||
|
|
||||||
KASM_PROCS['kasm_audio_server']=$!
|
KASM_PROCS['kasm_audio_server']=$!
|
||||||
|
|
||||||
if [[ $DEBUG == true ]]; then
|
if [[ $DEBUG == true ]]; then
|
||||||
echo -e "\n------------------ Started Audio Server ----------------------------"
|
echo -e "\n------------------ Started Audio Server ----------------------------"
|
||||||
echo "Kasm Audio Server PID: ${KASM_PROCS['kasm_audio_server']}";
|
echo "Kasm Audio Server PID: ${KASM_PROCS['kasm_audio_server']}";
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function start_audio_in (){
|
function start_audio_in (){
|
||||||
|
Loading…
x
Reference in New Issue
Block a user