Merge branch 'feature/KASM-4772-chrome-in-zoom' into 'develop'

Resolve KASM-4772 "Feature/ chrome in zoom"

Closes KASM-4772

See merge request kasm-technologies/internal/workspaces-images!132
This commit is contained in:
Richard Koliser 2023-08-14 20:19:29 +00:00
commit bffc94fee0
3 changed files with 25 additions and 6 deletions

View File

@ -10,21 +10,22 @@ WORKDIR $HOME
######### Customize Container Here ########### ######### Customize Container Here ###########
# Install Zoom
COPY ./src/ubuntu/install/zoom $INST_SCRIPTS/zoom/ COPY ./src/ubuntu/install/zoom $INST_SCRIPTS/zoom/
RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/
COPY ./src/ubuntu/install/zoom/custom_startup.sh $STARTUPDIR/custom_startup.sh COPY ./src/ubuntu/install/zoom/custom_startup.sh $STARTUPDIR/custom_startup.sh
RUN chmod +x $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh
RUN chmod 755 $STARTUPDIR/custom_startup.sh RUN chmod 755 $STARTUPDIR/custom_startup.sh
# Install Chrome
COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/
RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/
# Update the desktop environment to be optimized for a single application # Update the desktop environment to be optimized for a single application
RUN cp $HOME/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/* $HOME/.config/xfce4/xfconf/xfce-perchannel-xml/ RUN cp $HOME/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/* $HOME/.config/xfce4/xfconf/xfce-perchannel-xml/
RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png
RUN apt-get remove -y xfce4-panel RUN apt-get remove -y xfce4-panel
######### End Customizations ########### ######### End Customizations ###########
RUN chown 1000:0 $HOME RUN chown 1000:0 $HOME

View File

@ -5,7 +5,7 @@ PGREP="zoom"
export MAXIMIZE="true" export MAXIMIZE="true"
export MAXIMIZE_NAME="Zoom" export MAXIMIZE_NAME="Zoom"
MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
DEFAULT_ARGS="--no-sandbox" DEFAULT_ARGS=""
ARGS=${APP_ARGS:-$DEFAULT_ARGS} ARGS=${APP_ARGS:-$DEFAULT_ARGS}
options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit

View File

@ -8,11 +8,29 @@ if [ "${ARCH}" == "arm64" ] ; then
exit 0 exit 0
fi fi
# Install Zoom
wget -q https://zoom.us/client/latest/zoom_${ARCH}.deb wget -q https://zoom.us/client/latest/zoom_${ARCH}.deb
apt-get update apt-get update
apt-get install -y ./zoom_${ARCH}.deb apt-get install -y ./zoom_${ARCH}.deb
rm zoom_amd64.deb rm zoom_amd64.deb
sed -i 's#/usr/bin/zoom#/usr/bin/zoom --no-sandbox##' /usr/share/applications/Zoom.desktop
cp /usr/share/applications/Zoom.desktop $HOME/Desktop/ cp /usr/share/applications/Zoom.desktop $HOME/Desktop/
chmod +x $HOME/Desktop/Zoom.desktop chmod +x $HOME/Desktop/Zoom.desktop
# Add wrapper to detect seccomp
rm -f /usr/bin/zoom
cat > /usr/bin/zoom <<EOF
#!/bin/bash
if [[ \$(awk '/Seccomp:/ {print \$2}' /proc/1/status) == "0" ]]; then
/opt/zoom/ZoomLauncher "\$@"
else
/opt/zoom/ZoomLauncher --no-sandbox "\$@"
fi
EOF
chmod +x /usr/bin/zoom
if [ -z ${SKIP_CLEAN+x} ]; then
apt-get autoclean
rm -rf \
/var/lib/apt/lists/* \
/var/tmp/*
fi