From 1f076a7bb93b56264a3d3b21a6a9639eeb4022fa Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 17 Sep 2023 16:40:28 +0300 Subject: [PATCH] test --- Dockerfile.multistage | 71 ++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/Dockerfile.multistage b/Dockerfile.multistage index d9614a7..3b41196 100644 --- a/Dockerfile.multistage +++ b/Dockerfile.multistage @@ -1,4 +1,4 @@ -FROM debian:buster-slim AS builder +FROM ubuntu:focal AS builder # needed to install tzdata ARG DEBIAN_FRONTEND=noninteractive @@ -46,43 +46,44 @@ RUN cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. || \ RUN make -j $(nproc) # 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 -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/mumble-server /usr/bin/mumble-server +#COPY --from=builder /root/mumble/build/mumble-server.ini /etc/murmur/murmur.ini -RUN mkdir /etc/murmur && \ - chown --verbose -R murmur:murmur /etc/murmur +#COPY --from=builder /root/mumble/build /etc/ -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 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 -COPY --from=builder /root/mumble/build/ /etc/ +#EXPOSE 64738/tcp 64738/udp 50051 +#USER murmur -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 - -EXPOSE 64738/tcp 64738/udp 50051 -USER murmur - -CMD /usr/bin/mumble-server -v -fg -ini /etc/murmur/murmur.ini \ No newline at end of file +#CMD /usr/bin/mumble-server -v -fg -ini /etc/murmur/murmur.ini +CMD /root/mumble/build/mumble-server -v -fg -ini /root/mumble/build/mumble-server.ini \ No newline at end of file