From dd3d1d7ad03dcf17d5a3d25c2d93dbbdfad9a7e0 Mon Sep 17 00:00:00 2001
From: Danny Grove <danny@drgrovellc.com>
Date: Sun, 15 Dec 2019 18:52:03 -0800
Subject: [PATCH] Upgrade to v1.3.0, Move off root user, cleanup files

* Upgrade Mumble to v1.3.0
* Move off using root user in favor of mumble user
* Delete run.sh and docker-mumble.service as they're no longer needed
---
 Dockerfile            | 23 +++++++++++------------
 docker-mumble.service | 19 -------------------
 mumble-server.ini     |  3 ++-
 run.sh                | 22 ----------------------
 4 files changed, 13 insertions(+), 54 deletions(-)
 delete mode 100644 docker-mumble.service
 delete mode 100644 run.sh

diff --git a/Dockerfile b/Dockerfile
index bb3ac6d..57266e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,20 @@
-FROM debian:jessie
+ARG DEBIAN_DIGEST=sha256:fea737064e4143c3400289f76d759d6a98a69c308032022ef34e31e01555ca97
+ARG DEBIAN_VERSION=buster-slim
+FROM debian:${DEBIAN_VERSION}@${DEBIAN_DIGEST}
 
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y \
-        sudo \
-        pwgen \
-        mumble-server && \
+        mumble-server=1.3.0~git20190125.440b173+dfsg-2 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN useradd mumble
-
-ADD mumble-server.ini  /etc/mumble-server.ini
-ADD run.sh /tmp/run.sh
-
-VOLUME ["/var/lib/mumble-server"]
+RUN useradd mumble -m -d /home/mumble
+ADD mumble-server.ini  /home/mumble/.murmurd/murmur.ini
 
+USER mumble
+WORKDIR /home/mumble
+RUN touch /home/mumble/mumble.log /home/mumble/mumble.sqlite
 EXPOSE 64738/tcp 64738/udp
-
-CMD ["bash","/tmp/run.sh"]
+ENTRYPOINT ["/usr/sbin/murmurd"]
+CMD ["-fg"]
diff --git a/docker-mumble.service b/docker-mumble.service
deleted file mode 100644
index 0ac4156..0000000
--- a/docker-mumble.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=#! Mumble Server
-Author=Hashbang Team - team@hashbang.sh
-After=docker.service
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/docker run \
-  -v /home/core/mumble/certs:/etc/ssl/localcerts \
-  -v /home/core/mumble/lib:/var/lib/mumble-server \
-  -p 64738:64738 \
-  --rm \
-  --name="mumble" \
-  hashbang/mumble
-
-ExecStop=/usr/bin/docker stop mumble
-
-[Install]
-WantedBy=multi-user.target
diff --git a/mumble-server.ini b/mumble-server.ini
index 22a67c4..587981a 100644
--- a/mumble-server.ini
+++ b/mumble-server.ini
@@ -1,5 +1,6 @@
 icesecretwrite=
-database=/var/lib/mumble-server/mumble-server.sqlite
+database=/home/mumble/mumble.sqlite
+logfile=/home/mumble/mumble.log
 welcometext="<br />Welcome to this server running <b>Murmur</b> under Docker.<br />Enjoy your stay!<br />"
 host=0.0.0.0
 port=64738
diff --git a/run.sh b/run.sh
deleted file mode 100644
index f62779a..0000000
--- a/run.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-chown -R mumble: /var/lib/mumble-server
-
-touch /var/lib/mumble-server
-
-
-if [ -z "$SUPW" ]; then
-    SUPW="$(pwgen -s -c -n -1 15)"
-fi
-
-echo "Superuser Password: $SUPW"
-
-#exec sumurmurd -ini /etc/mumble-server.ini -supw $SUPW
-#exec sudo -u mumble murmurd -ini /etc/mumble-server.ini -fg
-
-/usr/sbin/murmurd -supw "$SUPW"
-/usr/sbin/murmurd -fg
-
-#/usr/bin/murmurd -ini /etc/mumble-server.ini -fg
-#murmurd -ini /etc/mumble-server.ini -supw "$SUPW" -fg
-#/usr/sbin/murmurd -fg -supw "$SUPW"
-