From 796c2f4764525a5c742e55c389b667910a72c861 Mon Sep 17 00:00:00 2001
From: L_DelOff <l_deloff@ldeloff.ru>
Date: Sun, 17 Sep 2023 17:09:58 +0300
Subject: [PATCH] test

---
 Dockerfile.multistage | 72 +++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/Dockerfile.multistage b/Dockerfile.multistage
index 06878d2..b1ff45d 100644
--- a/Dockerfile.multistage
+++ b/Dockerfile.multistage
@@ -30,7 +30,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 
-
 WORKDIR /root
 RUN git clone -b 1.5.x https://github.com/mumble-voip/mumble.git
 WORKDIR /root/mumble
@@ -45,45 +44,44 @@ RUN cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. || \
     )
 RUN make -j $(nproc)
 
+
+
 # Clean distribution stage
-#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/*
+FROM ubuntu:focal as prod
 
-#RUN mkdir /etc/murmur && \
-#    chown --verbose -R murmur:murmur /etc/murmur
+ARG DEBIAN_FRONTEND=noninteractive
 
-#COPY --from=builder /root/mumble/build/mumble-server /usr/bin/mumble-server
-#COPY --from=builder /root/mumble/build/mumble-server.ini /etc/murmur/murmur.ini
+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/*
 
-#COPY --from=builder /root/mumble/build /etc/
+RUN mkdir /opt/mumble && \
+	mkdir /opt/mumble/db && \
+	mkdir /opt/mumble/ini && \
+    chown --verbose -R mumble:mumble /opt/mumble
+	
+COPY --from=builder /root/mumble/build/mumble-server /opt/mumble
+COPY --from=builder /root/mumble/build/mumble-server.ini /opt/mumble/ini/murmur.ini
 
-#RUN mkdir /var/lib/murmur && \
-#	chown --verbose -R murmur:murmur /var/lib/murmur && \
-#	sed -i 's/^database=$/database=\/var\/lib\/murmur\/murmur.sqlite/' /etc/murmur/murmur.ini
+RUN sed -i 's/^database=$/database=\/opt\/mumble\/db\/murmur.sqlite/' /opt/mumble/ini/murmur.ini
 
-#EXPOSE 64738/tcp 64738/udp 50051
-#USER murmur
-
-#CMD /usr/bin/mumble-server -v -fg -ini /etc/murmur/murmur.ini
-CMD mumble-server -v -fg -ini mumble-server.ini
\ No newline at end of file
+EXPOSE 64738/tcp 64738/udp 50051
+USER mumble
+WORKDIR /
+CMD /opt/mumble/mumble-server -v -fg -ini /opt/mumble/ini/mumble-server.ini