From 2790281bd6b61c3f2169354f4c68fe5e8bf77a40 Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson.delahunt@lendi.com.au>
Date: Mon, 22 Mar 2021 14:03:50 +1100
Subject: [PATCH] ffmpeg

---
 docker/Dockerfile             | 12 +++++++++---
 docker/scripts/environment.sh |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index ca7e19e..f89e7c8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -52,6 +52,7 @@ RUN apt-get update -qq && \
   dnsmasq \
   docker.io \
   feh \
+  ffmpeg \
   figlet \
   fonts-font-awesome \
   g++ \
@@ -74,6 +75,7 @@ RUN apt-get update -qq && \
   make \
   man-db \
   mpd \
+  mpv \
   nano \
   ncdu \
   ncmpcpp \
@@ -83,8 +85,6 @@ RUN apt-get update -qq && \
   numlockx \
   openssl \
   openvpn \
-  pass \
-  pass-extension-otp \
   pavucontrol-qt \
   pcmanfm \
   perl \
@@ -284,6 +284,11 @@ RUN add-apt-repository ppa:longsleep/golang-backports && \
   apt-get update -qq && \
   apt-get install -qq golang-go
 
+# Install gopass
+RUN wget -O gopass.deb -nv https://github.com/gopasspw/gopass/releases/download/v1.12.4/gopass_1.12.4_linux_amd64.deb && \
+  dpkg -i gopass.deb || apt-get install -qq --fix-broken && \
+  rm gopass.deb
+
 # Install gotop
 RUN wget -q -O gotop-deb https://github.com/cjbassi/gotop/releases/download/3.0.0/gotop_3.0.0_linux_amd64.deb && \
   dpkg -i gotop-deb
@@ -347,7 +352,8 @@ RUN apt-get install -qq \
   cd /tmp/nchat/build && \
   cmake .. && \
   make -s && \
-  make install
+  make install && \
+  rm -rf /tmp/nchat
 
 # Install nmail
 RUN apt-get install -qq \
diff --git a/docker/scripts/environment.sh b/docker/scripts/environment.sh
index 0cb5a36..0845414 100755
--- a/docker/scripts/environment.sh
+++ b/docker/scripts/environment.sh
@@ -3,6 +3,7 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../..
 DESKTOP_ENVIRONMENT_USER=$USER
 DESKTOP_ENVIRONMENT_CONTAINER_IMAGE=desktop-environment
 DESKTOP_ENVIRONMENT_CONTAINER_NAME=${DESKTOP_ENVIRONMENT_CONTAINER_NAME-$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE}
+DESKTOP_ENVIRONMENT_GITHUB_TOKEN=${DESKTOP_ENVIRONMENT_GITHUB_TOKEN-}
 DESKTOP_ENVIRONMENT_GITHUB_USER=$(git --git-dir $REPO_ROOT/.git remote get-url origin | sed -E  's;.*github.com.(.*)/.*;\1;')
 DESKTOP_ENVIRONMENT_REGISTRY=${DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_GITHUB_USER}