Merge pull request 'update mumble server docker image to use debian bookworm' (#1) from murmur_on_bookworm into master

Reviewed-on: #1
This commit is contained in:
bsod 2024-02-13 20:04:07 +01:00
commit 351a26a0a7

View file

@ -1,4 +1,4 @@
FROM debian:bullseye AS builder FROM debian:bookworm AS builder
# Build-time dependencies # Build-time dependencies
RUN apt-get update -yqq && apt-get install -yqq \ RUN apt-get update -yqq && apt-get install -yqq \
@ -26,20 +26,19 @@ RUN apt-get update -yqq && apt-get install -yqq \
libxi-dev \ libxi-dev \
git --no-install-recommends git --no-install-recommends
WORKDIR /usr/src/murmur WORKDIR /usr/src/mumble
RUN \ RUN \
git clone https://github.com/mumble-voip/mumble.git . \ git clone https://github.com/mumble-voip/mumble.git . \
&& git checkout master \ && git checkout master \
&& git submodule init \ && git submodule init \
&& git submodule update && git submodule update
WORKDIR /usr/src/murmur/build WORKDIR /usr/src/mumble/build
RUN \ RUN \
cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. \ cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. \
&& make -j $(nproc) && make -j $(nproc)
FROM debian:bookworm
FROM debian:bullseye
EXPOSE 64738/tcp 64738/udp EXPOSE 64738/tcp 64738/udp
ENV HOME /home/user ENV HOME /home/user
@ -64,12 +63,12 @@ RUN apt-get update && apt-get install -yqq \
libzeroc-ice3.7 \ libzeroc-ice3.7 \
&& apt-get clean && rm -rf /var/lib/apt/lists/* && 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 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"] VOLUME ["/data"]
ENTRYPOINT [ "/usr/bin/murmurd" ] ENTRYPOINT [ "/usr/bin/mumble-server" ]
CMD [ "-fg", "-v", "-ini", "/data/murmur.ini" ] CMD [ "-fg", "-v", "-ini", "/data/mumble-server.ini" ]