Format indent

This commit is contained in:
paul 2020-08-11 23:02:45 +02:00 committed by Hive
parent c476a4d8a8
commit 4fc76b950b

View file

@ -2,42 +2,42 @@ FROM debian:buster 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 \
ca-certificates \ ca-certificates \
build-essential \ build-essential \
pkg-config \ pkg-config \
qt5-default \ qt5-default \
libqt5svg5* \ libqt5svg5* \
libboost-dev \ libboost-dev \
libasound2-dev \ libasound2-dev \
libssl-dev \ libssl-dev \
libspeechd-dev \ libspeechd-dev \
libzeroc-ice-dev \ libzeroc-ice-dev \
libpulse-dev \ libpulse-dev \
libcap-dev \ libcap-dev \
libprotobuf-dev \ libprotobuf-dev \
libprotoc-dev \ libprotoc-dev \
protobuf-compiler \ protobuf-compiler \
protobuf-compiler-grpc \ protobuf-compiler-grpc \
libgrpc++-dev \ libgrpc++-dev \
libogg-dev \ libogg-dev \
libavahi-compat-libdnssd-dev \ libavahi-compat-libdnssd-dev \
libsndfile1-dev \ libsndfile1-dev \
libbz2-dev \ libbz2-dev \
libxi-dev \ libxi-dev \
git --no-install-recommends git --no-install-recommends
WORKDIR /usr/src/murmur WORKDIR /usr/src/murmur
COPY 0001-Fix-ssl.patch / COPY 0001-Fix-ssl.patch /
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 apply /0001-Fix-ssl.patch \ && git apply /0001-Fix-ssl.patch \
&& git submodule init \ && git submodule init \
&& git submodule update && git submodule update
RUN \ RUN \
qmake -recursive main.pro CONFIG+="no-client no-g15 no-bonjour grpc" \ qmake -recursive main.pro CONFIG+="no-client no-g15 no-bonjour grpc" \
&& make release && make release
FROM debian:buster FROM debian:buster
@ -45,24 +45,24 @@ EXPOSE 64738/tcp 64738/udp
ENV HOME /home/user ENV HOME /home/user
RUN useradd --create-home --home-dir $HOME user \ RUN useradd --create-home --home-dir $HOME user \
&& chown -R user:user $HOME && chown -R user:user $HOME
WORKDIR $HOME WORKDIR $HOME
# Runtime dependencies # Runtime dependencies
RUN apt-get update && apt-get install -yqq \ RUN apt-get update && apt-get install -yqq \
ca-certificates \ ca-certificates \
'libprotobuf[0-9]+$' \ 'libprotobuf[0-9]+$' \
libqt5core5a \ libqt5core5a \
libqt5dbus5 \ libqt5dbus5 \
libqt5xml5 \ libqt5xml5 \
libqt5sql5 \ libqt5sql5 \
libqt5network5 \ libqt5network5 \
libcap2 \ libcap2 \
'libgrpc[0-9]+$' \ 'libgrpc[0-9]+$' \
libgrpc++1 \ libgrpc++1 \
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/release/murmurd /usr/bin/murmurd COPY --from=builder /usr/src/murmur/release/murmurd /usr/bin/murmurd