Initial test version

Author: olberger

Dockerfile

@@ -1,8 +1,10 @@
 # References:
+#   https://gist.github.com/demaniak/c56531c8d673a6f58ee54b5621796548
+#   https://github.com/mdouchement/docker-zoom-us
 #   https://hub.docker.com/r/solarce/zoom-us
 #   https://github.com/sameersbn/docker-skype
 FROM debian:buster
-MAINTAINER mdouchement
+MAINTAINER olberger
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -20,16 +22,22 @@ RUN apt-get install -qy curl iceweasel sudo desktop-file-utils lib32z1 \
   libxcb-keysyms1 libxcb-xtest0 ibus ibus-gtk \
   libnss3 libxss1 xcompmgr pulseaudio
 
-ARG ZOOM_URL=https://zoom.us/client/latest/zoom_amd64.deb
+RUN apt-get install -qy apt-utils \
+     libasound2 libatk-bridge2.0-0 libcairo2 libcups2 libgdk-pixbuf2.0-0 \
+    libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 \
+    libsecret-1-0 libx11-xcb1 libxcomposite1 libxcomposite1 \
+    libxss1 apt-transport-https libxkbfile1
+
+ARG TEAMS_URL="https://go.microsoft.com/fwlink/p/?LinkID=2112886&clcid=0x40c&culture=fr-fr&country=FR"
 
 # Grab the client .deb
 # Install the client .deb
 # Cleanup
-RUN curl -sSL $ZOOM_URL -o /tmp/zoom_setup.deb
-RUN dpkg -i /tmp/zoom_setup.deb
+RUN curl -sSL $TEAMS_URL -o /tmp/teams.deb
+RUN dpkg -i /tmp/teams.deb
 RUN apt-get -f install
 
-COPY scripts/ /var/cache/zoom-us/
+COPY scripts/ /var/cache/teams/
 COPY entrypoint.sh /sbin/entrypoint.sh
 RUN chmod 755 /sbin/entrypoint.sh
 

README.md

@@ -1,78 +1,89 @@
-This project is fully inspired of [sameersbn](https://github.com/sameersbn) [Skype](https://github.com/sameersbn/docker-skype)'s containerization.
+This project is fully inspired of Marc Douchement's [docker-zoom-us](https://github.com/mdouchement/docker-zoom-us), which in turn was inspired by [sameersbn](https://github.com/sameersbn) [Skype](https://github.com/sameersbn/docker-skype)'s containerization.
 
-# mdouchement/zoom-us
+# olberger/teams
 
 # Introduction
 
-`Dockerfile` to create a [Docker](https://www.docker.com/) container image with [Zoom](http://www.zoom.us) for Linux with support for audio/video calls.
+`Dockerfile` to create a [Docker](https://www.docker.com/) container image with [Teams](https://www.microsoft.com/en-us/microsoft-365/microsoft-teams/download-app) for Linux with support for audio/video calls.
 
-The image uses [X11](http://www.x.org) and [Pulseaudio](http://www.freedesktop.org/wiki/Software/PulseAudio/) unix domain sockets on the host to enable audio/video support in Zoom. These components are available out of the box on pretty much any modern linux distribution.
+The image uses [X11](http://www.x.org) and [Pulseaudio](http://www.freedesktop.org/wiki/Software/PulseAudio/) unix domain sockets on the host to enable audio/video support in Teams. These components are available out of the box on pretty much any modern linux distribution.
 
 ## Contributing
 
 If you find this image useful here's how you can help:
 
 - Send a pull request with your awesome features and bug fixes
-- Help users resolve their [issues](https://github.com/mdouchement/docker-zoom-us/issues?q=is%3Aopen+is%3Aissue).
+- Help users resolve their [issues](https://github.com/olberger/docker-teams/issues?q=is%3Aopen+is%3Aissue).
 
 # Getting started
 
 ## Installation
 
-Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/mdouchement/zoom-us) and is the recommended method of installation.
+Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/olberger/teams) and is the recommended method of installation.
 
 ```bash
-docker pull mdouchement/zoom-us:latest
+docker pull olberger/teams:latest
 ```
 
 Alternatively you can build the image yourself.
 
 ```bash
-docker build -t mdouchement/zoom-us github.com/mdouchement/docker-zoom-us
+docker build -t olberger/teams github.com/olberger/docker-teams
 ```
 
 With the image locally available, install the wrapper scripts by running the following as root:
 
 ```bash
 docker run -it --rm \
   --volume /usr/local/bin:/target \
-  mdouchement/zoom-us:latest install
+  olberger/teams:latest install
 ```
 
-This will install a wrapper script to launch `zoom`.
+This will install a wrapper script to launch `teams`.
 
-> **Note**
->
-> If Zoom is installed on the the host then the host binary is launched instead of starting a Docker container. To force the launch of Zoom in a container use the `zoom-us-wrapper` script. For example, `zoom-us-wrapper zoom` will launch Zoom inside a Docker container regardless of whether it is installed on the host or not.
+## Starting Teams
 
-## Web Browser / SSO
+Launch the teams-wrapper script to enter a shell inside the Docker container
+
+```bash
+teams-wrapper bash
+```
 
-Add the following option in `~/.config/zoomus.conf`
+Then the prompt should be displayed like:
 ```
-embeddedBrowserForSSOLogin=false
+Adding user `teams' to group `sudo' ...
+Adding user teams to group sudo
+Done.
+bash
+teams@0b2fefbf45d2:~$
 ```
 
-Zoom will spawn Iceweasel (Firefox) included in this image and open SSO provider web page.
+then type `teams`.
+
+
+> **Note**
+>
+> If Teams is installed on the the host then the host binary is launched instead of starting a Docker container. To force the launch of Teams in a container use the `teams-wrapper` script. For example, `teams-wrapper teams` will launch Teams inside a Docker container regardless of whether it is installed on the host or not.
+
 
 ## How it works
 
 The wrapper scripts volume mount the X11 and pulseaudio sockets in the launcher container. The X11 socket allows for the user interface display on the host, while the pulseaudio socket allows for the audio output to be rendered on the host.
 
 When the image is launched the following directories are mounted as volumes
 
-- `${HOME}/.zoom`
 - `${HOME}/.config`
 - `XDG_DOWNLOAD_DIR` or if it is missing `${HOME}/Downloads`
 - `XDG_DOCUMENTS_DIR` or if it is missing `${HOME}/Documents`
 
-This makes sure that your profile details are stored on the host and files received via Zoom are available on your host in the appropriate download directory.
+This makes sure that your profile details are stored on the host and files received via Teams are available on your host in the appropriate download directory.
 
-**Don't want to expose host's folders to Zoom?**
+**Don't want to expose host's folders to Teams?**
 
-Add `ZOOM_HOME` environment variable to namespace all Zoom folders:
+Add `TEAMS_HOME` environment variable to namespace all Teams folders:
 
 ```sh
-export ZOOM_HOME=${HOME}/zoomus
+export TEAMS_HOME=${HOME}/teams
 ```
 
 
@@ -85,42 +96,22 @@ To upgrade to newer releases:
   1. Download the updated Docker image:
 
   ```bash
-  docker pull mdouchement/zoom-us:latest
+  docker pull olberger/teams:latest
   ```
 
   2. Run `install` to make sure the host scripts are updated.
 
   ```bash
   docker run -it --rm \
     --volume /usr/local/bin:/target \
-    mdouchement/zoom-us:latest install
+    olberger/teams:latest install
   ```
 
 ## Uninstallation
 
 ```bash
 docker run -it --rm \
   --volume /usr/local/bin:/target \
-  mdouchement/zoom-us:latest uninstall
-```
-
-## Shell Access
-
-For debugging and maintenance purposes you may want access the containers shell. If you are using Docker version `1.3.0` or higher you can access a running containers shell by starting `bash` using `docker exec`:
-
-```bash
-docker exec -it zoomus bash
+  olberger/teams:latest uninstall
 ```
 
-## Troubleshooting
-
-- Zoom basic logs:
-  - `docker logs zoomus`
-  - `ls -l ${ZOOM_HOME:=$HOME}/.zoom/logs` where you can find application logs.
-- Screen sharing:
-  - Try `xhost +SI:localuser:"$USER"` [#20](https://github.com/mdouchement/docker-zoom-us/issues/20)
-- Transparent login form:
-  - A possible workaround is to right click on the Zoom icon from the taskbar and select "About". The about popup could fix the login form render.
-  - If `Unrecognized OpenGL version` error is in the logs, it could be an issue with Nvidia drivers [#1](https://github.com/mdouchement/docker-zoom-us/issues/1)
-    - @mzcu made a fix [mzcu@ee177a5](https://github.com/mzcu/docker-zoom-us/commit/ee177a5e8915a05a51080301996a8ed4b89552ee) that should work
-    - I recommend you to try his version: https://github.com/mzcu/docker-zoom-us

entrypoint.sh

@@ -1,38 +1,40 @@
 #!/bin/bash
 set -e
 
+#set -x
+
 USER_UID=${USER_UID:-1000}
 USER_GID=${USER_GID:-1000}
 
-ZOOM_US_USER=zoom
+TEAMS_USER=teams
 
-install_zoom_us() {
-  echo "Installing zoom-us-wrapper..."
-  install -m 0755 /var/cache/zoom-us/zoom-us-wrapper /target/
-  echo "Installing zoom-us..."
-  ln -sf zoom-us-wrapper /target/zoom
+install_teams() {
+  echo "Installing teams-wrapper..."
+  install -m 0755 /var/cache/teams/teams-wrapper /target/
+  echo "Installing teams..."
+  ln -sf teams-wrapper /target/teams
 }
 
-uninstall_zoom_us() {
-  echo "Uninstalling zoom-us-wrapper..."
-  rm -rf /target/zoom-us-wrapper
-  echo "Uninstalling zoom-us..."
-  rm -rf /target/zoom
+uninstall_teams() {
+  echo "Uninstalling teams-wrapper..."
+  rm -rf /target/teams-wrapper
+  echo "Uninstalling teams..."
+  rm -rf /target/teams
 }
 
 create_user() {
   # create group with USER_GID
-  if ! getent group ${ZOOM_US_USER} >/dev/null; then
-    groupadd -f -g ${USER_GID} ${ZOOM_US_USER} >/dev/null 2>&1
+  if ! getent group ${TEAMS_USER} >/dev/null; then
+    groupadd -f -g ${USER_GID} ${TEAMS_USER} >/dev/null 2>&1
   fi
 
   # create user with USER_UID
-  if ! getent passwd ${ZOOM_US_USER} >/dev/null; then
+  if ! getent passwd ${TEAMS_USER} >/dev/null; then
     adduser --disabled-login --uid ${USER_UID} --gid ${USER_GID} \
-      --gecos 'ZoomUs' ${ZOOM_US_USER} >/dev/null 2>&1
+      --gecos 'Teams' ${TEAMS_USER} >/dev/null 2>&1
   fi
-  chown ${ZOOM_US_USER}:${ZOOM_US_USER} -R /home/${ZOOM_US_USER}
-  adduser ${ZOOM_US_USER} sudo
+  chown ${TEAMS_USER}:${TEAMS_USER} -R /home/${TEAMS_USER}
+  adduser ${TEAMS_USER} sudo
 }
 
 grant_access_to_video_devices() {
@@ -42,33 +44,34 @@ grant_access_to_video_devices() {
       VIDEO_GID=$(stat -c %g $device)
       VIDEO_GROUP=$(stat -c %G $device)
       if [[ ${VIDEO_GROUP} == "UNKNOWN" ]]; then
-        VIDEO_GROUP=zoomusvideo
+        VIDEO_GROUP=teamsvideo
         groupadd -g ${VIDEO_GID} ${VIDEO_GROUP}
       fi
-      usermod -a -G ${VIDEO_GROUP} ${ZOOM_US_USER}
+      usermod -a -G ${VIDEO_GROUP} ${TEAMS_USER}
       break
     fi
   done
 }
 
-launch_zoom_us() {
-  cd /home/${ZOOM_US_USER}
-  exec sudo -HEu ${ZOOM_US_USER} PULSE_SERVER=/run/pulse/native QT_GRAPHICSSYSTEM="native" xcompmgr -c -l0 -t0 -r0 -o.00 &
-  exec sudo -HEu ${ZOOM_US_USER} PULSE_SERVER=/run/pulse/native QT_GRAPHICSSYSTEM="native" $@
+launch_bash() {
+  cd /home/${TEAMS_USER}
+#  exec sudo -HEu ${TEAMS_USER} PULSE_SERVER=/run/pulse/native QT_GRAPHICSSYSTEM="native" xcompmgr -c -l0 -t0 -r0 -o.00 &
+#  exec sudo -HEu ${TEAMS_USER} PULSE_SERVER=/run/pulse/native QT_GRAPHICSSYSTEM="native" $@
+  exec sudo -HEu ${TEAMS_USER} PULSE_SERVER=/run/pulse/native QT_GRAPHICSSYSTEM="native" /bin/bash
 }
 
 case "$1" in
   install)
-    install_zoom_us
+    install_teams
     ;;
   uninstall)
-    uninstall_zoom_us
+    uninstall_teams
     ;;
-  zoom)
+  bash)
     create_user
     grant_access_to_video_devices
     echo "$1"
-    launch_zoom_us $@
+    launch_bash $@
     ;;
   *)
     exec $@