Skip to content

Commit c3d1d36

Browse files
authored
Mumble 1.5.634 and Debian bookworm (#8)
1 parent e83841c commit c3d1d36

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

Dockerfile

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build stage
2-
FROM debian:bullseye AS build
2+
FROM debian:bookworm AS build
33

4-
ARG MUMBLE_RELEASE=1.4.287
4+
ARG MUMBLE_RELEASE=1.5.634
55

66
ARG DEBIAN_FRONTEND=noninteractive
77

@@ -49,18 +49,17 @@ RUN : \
4949
/root/mumble/mumble-* \
5050
&& make -j1
5151

52-
5352
# Distribution stage
54-
FROM debian:bullseye
53+
FROM debian:bookworm
5554

5655
ARG DEBIAN_FRONTEND=noninteractive
5756

5857
RUN : \
5958
&& apt-get update \
6059
&& apt-get install --no-install-recommends -y \
60+
libprotobuf32 \
6161
libavahi-compat-libdnssd1 \
6262
libcap2 \
63-
libprotobuf23 \
6463
libqt5core5a \
6564
libqt5network5 \
6665
libqt5sql5 \
@@ -72,7 +71,7 @@ RUN : \
7271
&& rm -rf /var/lib/apt/lists/*
7372

7473
COPY --from=build /root/mumble/build/mumble-server /usr/bin/mumble-server
75-
COPY --from=build /root/mumble/build/murmur.ini /etc/murmur/murmur.ini
74+
COPY --from=build /root/mumble/build/mumble-server.ini /etc/murmur/mumble-server.ini
7675

7776
RUN : \
7877
&& groupadd --gid 1000 murmur \
@@ -85,4 +84,4 @@ EXPOSE 64738/tcp 64738/udp
8584
ADD ./entrypoint.sh /entrypoint.sh
8685
ENTRYPOINT ["/entrypoint.sh"]
8786

88-
CMD ["mumble-server", "-v", "-fg", "-ini", "/config/murmur.ini"]
87+
CMD ["mumble-server", "-v", "-fg", "-ini", "/config/mumble-server.ini"]

entrypoint.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env bash
22

3-
if [[ ! -f /config/murmur.ini ]]; then
3+
if [[ ! -f /config/mumble-server.ini ]]; then
44
sed \
55
's|^database=.*$|database=/data/mumble-server.sqlite|' \
6-
/etc/murmur/murmur.ini \
7-
> /config/murmur.ini
6+
/etc/murmur/mumble-server.ini \
7+
> /config/mumble-server.ini
88
fi
99

1010
exec "$@"

0 commit comments

Comments
 (0)