From eb33e133ccdeac84592fa80496bdfd2665c9ab6a Mon Sep 17 00:00:00 2001
From: Zombi Dev User <zombi-dev@stqb.internal.dd.zom.bi>
Date: Wed, 5 Jul 2023 01:36:27 +0200
Subject: [PATCH] update mumble server docker image to use debian bookworm
we updated the "murmur" image to debian bookworm, changed paths which
have been changed (murmur.ini is now mumble-server.ini and in a
different dir) and renamed all directories from murmur to mumble-server
we did basic testing and it works generally. We couldn't get mumo to
work yet though. The grpc stuff is unsupported in the current mumble
release as well.
authored by:
- lino <cpp@zom.bi>
- lod <lod@zom.bi>
- bsod <bsod@zom.bi>
---
Dockerfile | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index e574c96..6793466 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye AS builder
+FROM debian:bookworm AS builder
# Build-time dependencies
RUN apt-get update -yqq && apt-get install -yqq \
@@ -26,20 +26,19 @@ RUN apt-get update -yqq && apt-get install -yqq \
libxi-dev \
git --no-install-recommends
-WORKDIR /usr/src/murmur
+WORKDIR /usr/src/mumble
RUN \
git clone https://github.com/mumble-voip/mumble.git . \
&& git checkout master \
&& git submodule init \
&& git submodule update
-WORKDIR /usr/src/murmur/build
+WORKDIR /usr/src/mumble/build
RUN \
cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. \
&& make -j $(nproc)
-
-FROM debian:bullseye
+FROM debian:bookworm
EXPOSE 64738/tcp 64738/udp
ENV HOME /home/user
@@ -64,12 +63,12 @@ RUN apt-get update && apt-get install -yqq \
libzeroc-ice3.7 \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /usr/src/murmur/build/murmurd /usr/bin/murmurd
+COPY --from=builder /usr/src/mumble/build/mumble-server /usr/bin/mumble-server
USER user
-COPY --from=builder --chown=user:user /usr/src/murmur/scripts/murmur.ini /data/murmur.ini
+COPY --from=builder --chown=user:user /usr/src/mumble/auxiliary_files/mumble-server.ini /data/mumble-server.ini
VOLUME ["/data"]
-ENTRYPOINT [ "/usr/bin/murmurd" ]
-CMD [ "-fg", "-v", "-ini", "/data/murmur.ini" ]
+ENTRYPOINT [ "/usr/bin/mumble-server" ]
+CMD [ "-fg", "-v", "-ini", "/data/mumble-server.ini" ]