fix
parent
f88dae8786
commit
19504dbeda
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:focal
|
FROM ubuntu:focal AS builder
|
||||||
|
|
||||||
# needed to install tzdata
|
# needed to install tzdata
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -37,7 +37,6 @@ WORKDIR /root/mumble
|
||||||
RUN git submodule update --init --recursive
|
RUN git submodule update --init --recursive
|
||||||
WORKDIR /root/mumble/build
|
WORKDIR /root/mumble/build
|
||||||
|
|
||||||
RUN git submodule update --init --recursive
|
|
||||||
RUN cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. || \
|
RUN cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. || \
|
||||||
( cat \
|
( cat \
|
||||||
/root/mumble/build/CMakeFiles/CMakeOutput.log \
|
/root/mumble/build/CMakeFiles/CMakeOutput.log \
|
||||||
|
@ -45,8 +44,6 @@ RUN cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. || \
|
||||||
&& false \
|
&& false \
|
||||||
)
|
)
|
||||||
RUN make -j $(nproc)
|
RUN make -j $(nproc)
|
||||||
RUN ls
|
|
||||||
RUN cat /root/mumble/build/mumble-server.ini
|
|
||||||
|
|
||||||
# Clean distribution stage
|
# Clean distribution stage
|
||||||
FROM ubuntu:focal
|
FROM ubuntu:focal
|
||||||
|
@ -73,8 +70,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY --from=0 /root/mumble/build/mumble-server /usr/bin/mumble-server
|
COPY --from=builder /root/mumble/build/mumble-server /usr/bin/mumble-server
|
||||||
COPY --from=0 /root/mumble/build/mumble-server.ini /etc/murmur/murmur.ini
|
#COPY --from=builder /root/mumble/build/mumble-server.ini /etc/murmur/murmur.ini
|
||||||
|
COPY --from=builder /root/mumble/build /etc/murmur/
|
||||||
|
|
||||||
RUN mkdir /var/lib/murmur && \
|
RUN mkdir /var/lib/murmur && \
|
||||||
chown --verbose murmur:murmur /var/lib/murmur && \
|
chown --verbose murmur:murmur /var/lib/murmur && \
|
||||||
|
|
Loading…
Reference in New Issue