From e3504df8e58278347f832e314c3564d3fd56f02a Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 21 Feb 2019 18:24:31 +0100
Subject: [PATCH] meson: Dockerfile - update build

---
 Dockerfile  | 18 ++++++++----------
 meson.build |  1 +
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99cfd47a6..6cfe08ada 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,10 @@ ENV KNOT_RESOLVER_BUILD_DEPS build-essential pkg-config bsdmainutils liblmdb-dev
 	libluajit-5.1-dev libuv1-dev libprotobuf-dev libprotobuf-c-dev \
 	libfstrm-dev luajit lua-sec lua-socket
 ENV BUILDENV_DEPS ${KNOT_DNS_BUILD_DEPS} ${KNOT_RESOLVER_BUILD_DEPS}
+RUN echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list
 RUN apt-get update -qq && \
-	apt-get -y -qqq install ${BUILDENV_DEPS}
+	apt-get -y -qqq install ${BUILDENV_DEPS} && \
+	apt-get -y -qqq install -t stretch-backports meson
 
 # Install Knot DNS from sources
 RUN git clone -b $KNOT_DNS_VERSION --depth=1 https://gitlab.labs.nic.cz/knot/knot-dns.git /tmp/knot-dns && \
@@ -34,7 +36,7 @@ FROM debian:stable-slim AS runtime
 # Install runtime dependencies
 ENV KNOT_DNS_RUNTIME_DEPS libgnutls30
 ENV KNOT_RESOLVER_RUNTIME_DEPS liblmdb0 luajit libluajit-5.1-2 libuv1 lua-sec lua-socket
-ENV KNOT_RESOLVER_RUNTIME_DEPS_HTTP libjs-bootstrap libjs-d3 libjs-jquery lua-http lua-mmdb
+ENV KNOT_RESOLVER_RUNTIME_DEPS_HTTP lua-http lua-mmdb
 ENV KNOT_RESOLVER_RUNTIME_DEPS_EXTRA libfstrm0 lua-cqueues
 ENV KNOT_RESOLVER_RUNTIME_DEPS_SSL ca-certificates
 ENV RUNTIME_DEPS ${KNOT_DNS_RUNTIME_DEPS} ${KNOT_RESOLVER_RUNTIME_DEPS} \
@@ -53,14 +55,10 @@ FROM knot-dns-build AS build
 COPY . /tmp/knot-resolver
 
 # Build Knot Resolver
-ARG CFLAGS="-O2 -fstack-protector -g"
-ENV LDFLAGS -Wl,--as-needed
 RUN cd /tmp/knot-resolver && \
-	make "-j$(nproc)" && \
-	make install DESTDIR=/tmp/root && \
-	mkdir -p /tmp/root/etc/knot-resolver && \
-	cp ./etc/config.docker /tmp/root/etc/knot-resolver/kresd.conf && \
-	cp ./distro/common/root.keys /tmp/root/etc/knot-resolver/
+	meson build_docker --buildtype=plain --prefix=/usr --libdir=lib -Dc_args="-O2 -fstack-protector -g" && \
+	DESTDIR=/tmp/root ninja -C build_docker install && \
+	cp /tmp/root/usr/share/doc/knot-resolver/examples/config.docker /tmp/root/etc/knot-resolver/kresd.conf
 
 
 # Final container
@@ -75,5 +73,5 @@ EXPOSE 53/UDP 53/TCP 853/TCP 8053/TCP
 COPY --from=build /tmp/root/ /
 RUN ldconfig
 
-ENTRYPOINT ["/usr/local/sbin/kresd"]
+ENTRYPOINT ["/usr/sbin/kresd"]
 CMD ["-c", "/etc/knot-resolver/kresd.conf"]
diff --git a/meson.build b/meson.build
index a653d24ac..de162c2c4 100644
--- a/meson.build
+++ b/meson.build
@@ -82,6 +82,7 @@ message('---------------------------')
 ## Compiler args
 add_project_arguments(
   '-D_GNU_SOURCE',
+  '-Wformat',
   '-Wformat-security',
   '-Wtype-limits',
   '-Wshadow',
-- 
2.47.2