From 1af632018236735ffd5684cef93dd6178122f8ad Mon Sep 17 00:00:00 2001 From: gnovakovic Date: Sat, 26 Dec 2020 12:29:25 +0100 Subject: [PATCH 1/4] Add missing zoom dependencies --- zoom-us/Dockerfile | 92 +++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/zoom-us/Dockerfile b/zoom-us/Dockerfile index 8b465685b..067a0bdba 100644 --- a/zoom-us/Dockerfile +++ b/zoom-us/Dockerfile @@ -1,11 +1,11 @@ # docker run -d --rm \ -# -v /tmp/.X11-unix:/tmp/.X11-unix \ -# -e DISPLAY=unix\$DISPLAY \ -# --device /dev/video0 \ -# --device /dev/snd:/dev/snd \ -# --device /dev/dri \ -# -v /dev/shm:/dev/shm \ -# jess/zoom-us +# -v /tmp/.X11-unix:/tmp/.X11-unix \ +# -e DISPLAY=unix\$DISPLAY \ +# --device /dev/video0 \ +# --device /dev/snd:/dev/snd \ +# --device /dev/dri \ +# -v /dev/shm:/dev/shm \ +# jess/zoom-us FROM debian:sid-slim @@ -13,49 +13,51 @@ ENV DEBIAN_FRONTEND noninteractive # Dependencies for the client .deb RUN apt-get update && apt-get install -y \ - ca-certificates \ - curl \ - desktop-file-utils \ - ibus \ - ibus-gtk \ - lib32z1 \ - libx11-6 \ - libasound2-dev \ - libegl1-mesa \ - libxcb-shm0 \ - libglib2.0-0 \ - libgl1-mesa-glx \ - libxrender1 \ - libxcomposite1 \ - libxslt1.1 \ - libgstreamer1.0-dev \ - libgstreamer-plugins-base1.0-dev \ - libxi6 \ - libsm6 \ - libfontconfig1 \ - libpulse0 \ - libsqlite3-0 \ - libxcb-shape0 \ - libxcb-xfixes0 \ - libxcb-randr0 \ - libxcb-image0 \ - libxcb-keysyms1 \ - libxcb-xtest0 \ - libxtst6 \ - libnss3 \ - libxss1 \ - sudo \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + ca-certificates \ + curl \ + desktop-file-utils \ + ibus \ + ibus-gtk \ + lib32z1 \ + libx11-6 \ + libasound2-dev \ + libegl1-mesa \ + libxcb-shm0 \ + libxcb-xinerama0 \ + libxkbcommon-x11-0 \ + libglib2.0-0 \ + libgl1-mesa-glx \ + libxrender1 \ + libxcomposite1 \ + libxslt1.1 \ + libgstreamer1.0-dev \ + libgstreamer-plugins-base1.0-dev \ + libxi6 \ + libsm6 \ + libfontconfig1 \ + libpulse0 \ + libsqlite3-0 \ + libxcb-shape0 \ + libxcb-xfixes0 \ + libxcb-randr0 \ + libxcb-image0 \ + libxcb-keysyms1 \ + libxcb-xtest0 \ + libxtst6 \ + libnss3 \ + libxss1 \ + sudo \ + --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* ARG ZOOM_URL=https://zoom.us/client/latest/zoom_amd64.deb #install zoom RUN curl -sSL $ZOOM_URL -o /tmp/zoom_setup.deb \ - && dpkg -i /tmp/zoom_setup.deb \ - && apt-get -f install \ - && rm /tmp/zoom_setup.deb \ - && rm -rf /var/lib/apt/lists/* + && dpkg -i /tmp/zoom_setup.deb \ + && apt-get -f install \ + && rm /tmp/zoom_setup.deb \ + && rm -rf /var/lib/apt/lists/* WORKDIR /usr/bin CMD [ "./zoom" ] From 06b03ddaff650283f427169e18bd451bd36f58e8 Mon Sep 17 00:00:00 2001 From: gnovakovic Date: Sat, 26 Dec 2020 12:37:57 +0100 Subject: [PATCH 2/4] Revert "Add missing zoom dependencies" This reverts commit 1af632018236735ffd5684cef93dd6178122f8ad. --- zoom-us/Dockerfile | 92 +++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 47 deletions(-) diff --git a/zoom-us/Dockerfile b/zoom-us/Dockerfile index 067a0bdba..8b465685b 100644 --- a/zoom-us/Dockerfile +++ b/zoom-us/Dockerfile @@ -1,11 +1,11 @@ # docker run -d --rm \ -# -v /tmp/.X11-unix:/tmp/.X11-unix \ -# -e DISPLAY=unix\$DISPLAY \ -# --device /dev/video0 \ -# --device /dev/snd:/dev/snd \ -# --device /dev/dri \ -# -v /dev/shm:/dev/shm \ -# jess/zoom-us +# -v /tmp/.X11-unix:/tmp/.X11-unix \ +# -e DISPLAY=unix\$DISPLAY \ +# --device /dev/video0 \ +# --device /dev/snd:/dev/snd \ +# --device /dev/dri \ +# -v /dev/shm:/dev/shm \ +# jess/zoom-us FROM debian:sid-slim @@ -13,51 +13,49 @@ ENV DEBIAN_FRONTEND noninteractive # Dependencies for the client .deb RUN apt-get update && apt-get install -y \ - ca-certificates \ - curl \ - desktop-file-utils \ - ibus \ - ibus-gtk \ - lib32z1 \ - libx11-6 \ - libasound2-dev \ - libegl1-mesa \ - libxcb-shm0 \ - libxcb-xinerama0 \ - libxkbcommon-x11-0 \ - libglib2.0-0 \ - libgl1-mesa-glx \ - libxrender1 \ - libxcomposite1 \ - libxslt1.1 \ - libgstreamer1.0-dev \ - libgstreamer-plugins-base1.0-dev \ - libxi6 \ - libsm6 \ - libfontconfig1 \ - libpulse0 \ - libsqlite3-0 \ - libxcb-shape0 \ - libxcb-xfixes0 \ - libxcb-randr0 \ - libxcb-image0 \ - libxcb-keysyms1 \ - libxcb-xtest0 \ - libxtst6 \ - libnss3 \ - libxss1 \ - sudo \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + ca-certificates \ + curl \ + desktop-file-utils \ + ibus \ + ibus-gtk \ + lib32z1 \ + libx11-6 \ + libasound2-dev \ + libegl1-mesa \ + libxcb-shm0 \ + libglib2.0-0 \ + libgl1-mesa-glx \ + libxrender1 \ + libxcomposite1 \ + libxslt1.1 \ + libgstreamer1.0-dev \ + libgstreamer-plugins-base1.0-dev \ + libxi6 \ + libsm6 \ + libfontconfig1 \ + libpulse0 \ + libsqlite3-0 \ + libxcb-shape0 \ + libxcb-xfixes0 \ + libxcb-randr0 \ + libxcb-image0 \ + libxcb-keysyms1 \ + libxcb-xtest0 \ + libxtst6 \ + libnss3 \ + libxss1 \ + sudo \ + --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* ARG ZOOM_URL=https://zoom.us/client/latest/zoom_amd64.deb #install zoom RUN curl -sSL $ZOOM_URL -o /tmp/zoom_setup.deb \ - && dpkg -i /tmp/zoom_setup.deb \ - && apt-get -f install \ - && rm /tmp/zoom_setup.deb \ - && rm -rf /var/lib/apt/lists/* + && dpkg -i /tmp/zoom_setup.deb \ + && apt-get -f install \ + && rm /tmp/zoom_setup.deb \ + && rm -rf /var/lib/apt/lists/* WORKDIR /usr/bin CMD [ "./zoom" ] From 068be0235dc81816394bed414d9d65686a14abf3 Mon Sep 17 00:00:00 2001 From: gnovakovic Date: Sat, 26 Dec 2020 12:43:06 +0100 Subject: [PATCH 3/4] Add missing zoom dependencies --- zoom-us/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zoom-us/Dockerfile b/zoom-us/Dockerfile index 8b465685b..272367fe2 100644 --- a/zoom-us/Dockerfile +++ b/zoom-us/Dockerfile @@ -23,6 +23,8 @@ RUN apt-get update && apt-get install -y \ libasound2-dev \ libegl1-mesa \ libxcb-shm0 \ + libxcb-xinerama0 \ + libxkbcommon-x11-0 \ libglib2.0-0 \ libgl1-mesa-glx \ libxrender1 \ From eb8c8c7e1437578f7bd0bcaab26f857e24d470a9 Mon Sep 17 00:00:00 2001 From: gnovakovic Date: Sat, 26 Dec 2020 19:48:48 +0100 Subject: [PATCH 4/4] Revert "Add missing zoom dependencies" This reverts commit 068be0235dc81816394bed414d9d65686a14abf3. --- zoom-us/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/zoom-us/Dockerfile b/zoom-us/Dockerfile index 272367fe2..8b465685b 100644 --- a/zoom-us/Dockerfile +++ b/zoom-us/Dockerfile @@ -23,8 +23,6 @@ RUN apt-get update && apt-get install -y \ libasound2-dev \ libegl1-mesa \ libxcb-shm0 \ - libxcb-xinerama0 \ - libxkbcommon-x11-0 \ libglib2.0-0 \ libgl1-mesa-glx \ libxrender1 \