Compare commits

..

3 Commits

Author SHA1 Message Date
6ada4cfdf6 test 2023-09-17 16:41:04 +03:00
1f076a7bb9 test 2023-09-17 16:40:28 +03:00
80b4dd1f80 test 2023-09-17 11:57:40 +03:00
2 changed files with 36 additions and 36 deletions

View File

@@ -46,43 +46,44 @@ RUN cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. || \
RUN make -j $(nproc) RUN make -j $(nproc)
# Clean distribution stage # Clean distribution stage
FROM debian:buster-slim as prod #FROM ubuntu:focal as prod
#
#ARG DEBIAN_FRONTEND=noninteractive
#
#RUN adduser murmur
#RUN apt-get update && apt-get install --no-install-recommends -y \
# libcap2 \
# libzeroc-ice3.7 \
# '^libprotobuf[0-9]+$' \
# '^libgrpc[0-9]+$' \
# libgrpc++1 \
# libavahi-compat-libdnssd1 \
# libqt5core5a \
# libqt5network5 \
# libqt5sql5 \
# libqt5sql5-mysql \
# libqt5sql5-psql \
# libqt5sql5-sqlite \
# libqt5xml5 \
# libqt5dbus5 \
# ca-certificates \
# && apt-get clean \
# && rm -rf /var/lib/apt/lists/*
ARG DEBIAN_FRONTEND=noninteractive #RUN mkdir /etc/murmur && \
# chown --verbose -R murmur:murmur /etc/murmur
RUN adduser murmur #COPY --from=builder /root/mumble/build/mumble-server /usr/bin/mumble-server
RUN apt-get update && apt-get install --no-install-recommends -y \ #COPY --from=builder /root/mumble/build/mumble-server.ini /etc/murmur/murmur.ini
libcap2 \
libzeroc-ice3.7 \
'^libprotobuf[0-9]+$' \
'^libgrpc[0-9]+$' \
libgrpc++1 \
libavahi-compat-libdnssd1 \
libqt5core5a \
libqt5network5 \
libqt5sql5 \
libqt5sql5-mysql \
libqt5sql5-psql \
libqt5sql5-sqlite \
libqt5xml5 \
libqt5dbus5 \
ca-certificates \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN mkdir /etc/murmur && \ #COPY --from=builder /root/mumble/build /etc/
chown --verbose -R murmur:murmur /etc/murmur
COPY --from=builder /root/mumble/build/mumble-server /usr/bin/mumble-server #RUN mkdir /var/lib/murmur && \
COPY --from=builder /root/mumble/build/mumble-server.ini /etc/murmur/murmur.ini # chown --verbose -R murmur:murmur /var/lib/murmur && \
# sed -i 's/^database=$/database=\/var\/lib\/murmur\/murmur.sqlite/' /etc/murmur/murmur.ini
COPY --from=builder /root/mumble/build/ /etc/ #EXPOSE 64738/tcp 64738/udp 50051
#USER murmur
RUN mkdir /var/lib/murmur && \ #CMD /usr/bin/mumble-server -v -fg -ini /etc/murmur/murmur.ini
chown --verbose -R murmur:murmur /var/lib/murmur && \ CMD /root/mumble/build/mumble-server -v -fg -ini /root/mumble/build/mumble-server.ini
sed -i 's/^database=$/database=\/var\/lib\/murmur\/murmur.sqlite/' /etc/murmur/murmur.ini
EXPOSE 64738/tcp 64738/udp 50051
USER murmur
CMD /usr/bin/mumble-server -v -fg -ini /etc/murmur/murmur.ini

View File

@@ -5,8 +5,7 @@ services:
context: . context: .
dockerfile: Dockerfile.multistage dockerfile: Dockerfile.multistage
volumes: volumes:
- /mnt/data/mumble/data/conf:/etc - /mnt/data/mumble/data/:/root
- /mnt/data/mumble/data/db:/var/lib/murmur
ports: ports:
- 64738:64738/tcp - 64738:64738/tcp
- 64738:64738/udp - 64738:64738/udp