From 16a77bdf18b2a291fc7827f10c5d54af1081c7e4 Mon Sep 17 00:00:00 2001
From: Christoffer Nissen <christoffer.nissen@gmail.com>
Date: Tue, 18 Jan 2022 21:48:30 +0100
Subject: [PATCH] Refactored dockerfile

---
 Dockerfile | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index db9a588..0c00835 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,10 @@
 FROM debian:latest
 LABEL author=stifstof
 
-ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update -qy
 
-RUN apt-get update
-RUN apt-get install -qy curl ca-certificates sudo libxkbfile1
-
-RUN apt-get install -y \
-		curl \
-		fonts-noto-color-emoji \
-		libsecret-1-0 \
-		pulseaudio \
-    gnupg2 \
-    && curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - \
-    && sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/ms-teams stable main" > /etc/apt/sources.list.d/teams.list' \
-    && apt-get -y update \
-    && apt-get -y install teams
-
-RUN apt-get install -y \
+# General Desktop dependencies not caught by apt-get
+RUN apt-get install -qy \
   gvfs-bin \
   libglib2.0-bin \
   trash-cli \
@@ -38,8 +25,22 @@ RUN apt-get install -y \
   mesa-utils \
   libgl1-mesa-glx
 
-# Grab the client .deb
-# Install the client .deb
+# Install teams and teams specific dependencies
+RUN apt-get install -qy \
+  curl \
+  ca-certificates \
+  sudo \
+  libxkbfile1 \
+  fonts-noto-color-emoji \
+  libsecret-1-0 \
+  pulseaudio \
+  gnupg2 \
+  && curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - \
+  && sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/ms-teams stable main" > /etc/apt/sources.list.d/teams.list' \
+  && apt-get -y update \
+  && apt-get -y install teams
+
+# Copy scripts to correct location (/var/cache is host machine)
 COPY docker-scripts/xdg-open /usr/local/bin/
 COPY host-scripts/ /var/cache/teams/
 COPY docker-scripts/entrypoint.sh /sbin/entrypoint.sh
@@ -48,4 +49,7 @@ RUN chmod 755 /sbin/entrypoint.sh
 # Cleanup
 RUN rm -rf /var/lib/apt/lists/*
 
-ENTRYPOINT ["/sbin/entrypoint.sh"]
+# Check version of teams
+RUN apt show teams | grep "Version:" && echo ""
+
+ENTRYPOINT ["/sbin/entrypoint.sh"]
\ No newline at end of file