Merge branch 'feature/KASM-4081-fix-builds-112' into 'release/1.12.0'

Resolve KASM-4081 "Feature/ fix builds 112"

See merge request kasm-technologies/internal/workspaces-images!105

.gitlab-ci.yml

@@ -61,7 +61,6 @@ variables:
   - postman
   - signal
   - steam
-  - teams
   - tracelabs
   - ubuntu-focal-dind
   - ubuntu-focal-dind-rootless
@@ -140,7 +139,7 @@ build_app_images:
     - aws-autoscale
   parallel:
     matrix:
-      - KASM_IMAGE: [sublime-text, gimp, vs-code, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, remmina, discord, libre-office, thunderbird, atom, audacity, deluge, filezilla, inkscape, pinta, qbittorrent, blender, unityhub]
+      - KASM_IMAGE: [sublime-text, gimp, vs-code, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, remmina, discord, libre-office, thunderbird, atom, audacity, deluge, filezilla, inkscape, pinta, qbittorrent, blender, unityhub]
 
 build_ubuntu_desktop_images:
   stage: build
@@ -575,7 +574,7 @@ build_schedules_app_images:
     - aws-autoscale
   parallel:
     matrix:
-      - KASM_IMAGE: [sublime-text, gimp, vs-code, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, remmina, discord, libre-office, thunderbird, atom, audacity, deluge, filezilla, inkscape, pinta, qbittorrent, blender, unityhub]
+      - KASM_IMAGE: [sublime-text, gimp, vs-code, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, remmina, discord, libre-office, thunderbird, atom, audacity, deluge, filezilla, inkscape, pinta, qbittorrent, blender, unityhub]
 
 build_schedules_ubuntu_desktop_images:
   image: ${ORG_NAME}/docker-buildx-private:develop

dockerfile-kasm-desktop-deluxe

@@ -54,10 +54,6 @@ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh  && rm -rf $INST_SCRIPTS/n
 COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/
 RUN bash $INST_SCRIPTS/remmina/install_remmina.sh  && rm -rf $INST_SCRIPTS/remmina/
 
-### Install Teams
-COPY ./src/ubuntu/install/teams $INST_SCRIPTS/teams/
-RUN bash $INST_SCRIPTS/teams/install_teams.sh  && rm -rf $INST_SCRIPTS/teams/
-
 ### Install Only Office
 COPY ./src/ubuntu/install/only_office $INST_SCRIPTS/only_office/
 RUN bash $INST_SCRIPTS/only_office/install_only_office.sh  && rm -rf $INST_SCRIPTS/only_office/

dockerfile-kasm-opensuse-15-desktop

@@ -76,10 +76,6 @@ RUN bash $INST_SCRIPTS/telegram/install_telegram.sh  && rm -rf $INST_SCRIPTS/tel
 COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/
 RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh  && rm -rf $INST_SCRIPTS/thunderbird/
 
-### Install Teams
-COPY ./src/opensuse/install/teams $INST_SCRIPTS/teams/
-RUN bash $INST_SCRIPTS/teams/install_teams.sh  && rm -rf $INST_SCRIPTS/teams/
-
 #ADD ./src/common/scripts $STARTUPDIR
 RUN $STARTUPDIR/set_user_permission.sh $HOME
 

dockerfile-kasm-oracle-7-desktop

@@ -44,10 +44,6 @@ RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh  && rm -rf $INST_SCRIPTS/vs_co
 COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/
 RUN bash $INST_SCRIPTS/remmina/install_remmina.sh  && rm -rf $INST_SCRIPTS/remmina/
 
-### Install Teams
-COPY ./src/oracle/install/teams $INST_SCRIPTS/teams/
-RUN bash $INST_SCRIPTS/teams/install_teams.sh  && rm -rf $INST_SCRIPTS/teams/
-
 ### Install Only Office
 COPY ./src/oracle/install/only_office $INST_SCRIPTS/only_office/
 RUN bash $INST_SCRIPTS/only_office/install_only_office.sh  && rm -rf $INST_SCRIPTS/only_office/

dockerfile-kasm-oracle-8-desktop

@@ -51,10 +51,6 @@ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh  && rm -rf $INST_SCRIPTS/n
 COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/
 RUN bash $INST_SCRIPTS/remmina/install_remmina.sh  && rm -rf $INST_SCRIPTS/remmina/
 
-### Install Teams
-COPY ./src/oracle/install/teams $INST_SCRIPTS/teams/
-RUN bash $INST_SCRIPTS/teams/install_teams.sh  && rm -rf $INST_SCRIPTS/teams/
-
 ### Install Only Office
 COPY ./src/oracle/install/only_office $INST_SCRIPTS/only_office/
 RUN bash $INST_SCRIPTS/only_office/install_only_office.sh  && rm -rf $INST_SCRIPTS/only_office/

dockerfile-kasm-ubuntu-focal-desktop

@@ -54,10 +54,6 @@ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh  && rm -rf $INST_SCRIPTS/n
 COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/
 RUN bash $INST_SCRIPTS/remmina/install_remmina.sh  && rm -rf $INST_SCRIPTS/remmina/
 
-### Install Teams
-COPY ./src/ubuntu/install/teams $INST_SCRIPTS/teams/
-RUN bash $INST_SCRIPTS/teams/install_teams.sh  && rm -rf $INST_SCRIPTS/teams/
-
 ### Install Only Office
 COPY ./src/ubuntu/install/only_office $INST_SCRIPTS/only_office/
 RUN bash $INST_SCRIPTS/only_office/install_only_office.sh  && rm -rf $INST_SCRIPTS/only_office/

dockerfile-kasm-ubuntu-jammy-desktop

@@ -54,10 +54,6 @@ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh  && rm -rf $INST_SCRIPTS/n
 COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/
 RUN bash $INST_SCRIPTS/remmina/install_remmina.sh  && rm -rf $INST_SCRIPTS/remmina/
 
-### Install Teams
-COPY ./src/ubuntu/install/teams $INST_SCRIPTS/teams/
-RUN bash $INST_SCRIPTS/teams/install_teams.sh  && rm -rf $INST_SCRIPTS/teams/
-
 ### Install Only Office
 COPY ./src/ubuntu/install/only_office $INST_SCRIPTS/only_office/
 RUN bash $INST_SCRIPTS/only_office/install_only_office.sh  && rm -rf $INST_SCRIPTS/only_office/

docs/teams/demo.txt

@@ -1,5 +1,11 @@
+# This image is deprecated
+
+Microsoft has retired Teams for Linux [More Info](https://learn.microsoft.com/en-us/microsoftteams/hardware-requirements-for-the-teams-app#hardware-requirements-for-teams-on-linux)
+
 # Live Demo
 
+<a href="https://app.kasmweb.com/#/cast/9502332749" target="_blank"><img src="https://info.kasmweb.com/hubfs/dockerhub/GIFs/teams.gif" width="640" height="360"></a>
+
 **Launch a real-time demo in a new browser window:** <a href="https://app.kasmweb.com/#/cast/9502332749" target="_blank">Live Demo</a>.
 
 <a href="https://app.kasmweb.com/#/cast/9502332749" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/Teams.png" width="300" height="104"></a>

src/ubuntu/install/tracelabs/install_tracelabs.sh

@@ -36,7 +36,7 @@ chown -R 1000:1000 \
 
 apt-get install -y python3-pip
 
-pip3 install --force-reinstall zope.event
+pip3 install --break-system-packages --force-reinstall zope.event
 
 sed -i 's/sudo //g' /usr/share/applications/tl*.desktop
 

src/ubuntu/install/vivaldi/install_vivaldi.sh

@@ -8,7 +8,15 @@ wget -qO- https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor
 echo "deb [signed-by=/usr/share/keyrings/vivaldi-browser.gpg arch=$(dpkg --print-architecture)] https://repo.vivaldi.com/archive/deb/ stable main" > /etc/apt/sources.list.d/vivaldi-archive.list
 apt-get update && apt-get install -y vivaldi-stable
 mkdir -p /var/opt/vivaldi
-/opt/vivaldi/update-ffmpeg
+set +e
+for i in {1..120}; do
+    /opt/vivaldi/update-ffmpeg
+    if [ $? -eq 0 ]; then
+        break
+    fi
+    sleep 1
+done
+set -e
 
 # Add Desktop Icon
 cp /usr/share/applications/vivaldi-stable.desktop $HOME/Desktop/