Skip to content
Permalink
Browse files

Merge PR #3690: Build/package murmur in a docker image

  • Loading branch information...
davidebeatrici committed May 9, 2019
2 parents 5a4f4cd + 041136d commit cbbc34250885dea026a4dfeb591216855da74eba
Showing with 63 additions and 7 deletions.
  1. +63 −0 Dockerfile
  2. +0 −2 src/murmur/murmur.pro
  3. +0 −5 src/murmur/murmur_ice/murmur_ice.pro
@@ -0,0 +1,63 @@
FROM ubuntu:disco

# needed to install tzdata in disco
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y \
build-essential \
pkg-config \
qt5-default \
libboost-dev \
libasound2-dev \
libssl-dev \
libspeechd-dev \
libzeroc-ice-dev \
libpulse-dev \
libcap-dev \
libprotobuf-dev \
protobuf-compiler \
protobuf-compiler-grpc \
libprotoc-dev \
libogg-dev \
libavahi-compat-libdnssd-dev \
libsndfile1-dev \
libgrpc++-dev \
libxi-dev \
libbz2-dev \
qtcreator

COPY . /root/mumble
WORKDIR /root/mumble

RUN qmake -recursive main.pro CONFIG+="no-client grpc"
RUN make release

# Clean distribution stage
FROM ubuntu:disco

RUN adduser murmur
RUN apt-get update && apt-get install -y \
libcap2 \
libzeroc-ice3.7 \
libprotobuf17 \
libgrpc6 \
libgrpc++1 \
libavahi-compat-libdnssd1 \
libqt5core5a \
libqt5network5 \
libqt5sql5 \
libqt5xml5 \
libqt5dbus5 \
&& rm -rf /var/lib/apt/lists/*

COPY --from=0 /root/mumble/release/murmurd /usr/bin/murmurd
COPY --from=0 /root/mumble/scripts/murmur.ini /etc/murmur/murmur.ini

RUN mkdir /var/lib/murmur && \
chown 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/murmurd -v -fg -ini /etc/murmur/murmur.ini
@@ -136,8 +136,6 @@ ice {
}

unix:!macx:CONFIG(static) {
INCLUDEPATH *= /opt/Ice-3.3/include
QMAKE_LIBDIR *= /opt/Ice-3.3/lib
LIBS *= -lbz2
QMAKE_CXXFLAGS *= -fPIC
}
@@ -56,11 +56,6 @@ unix:!macx:CONFIG(buildenv) {
slice.commands = $$(MUMBLE_ICE_PREFIX)/bin/slice2cpp --checksum -I$$(MUMBLE_ICE_PREFIX)/slice/ ../Murmur.ice
}

unix:!macx:CONFIG(static) {
INCLUDEPATH *= /opt/Ice-3.3/include
slice.commands = /opt/Ice-3.3/bin/slice2cpp --checksum -I/opt/Ice-3.3/slice ../Murmur.ice
}

macx:CONFIG(static) {
LIBS *= -lbz2 -liconv
QMAKE_CXXFLAGS *= -fPIC

0 comments on commit cbbc342

Please sign in to comment.
You can’t perform that action at this time.