Commit 9491aa50 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' into knot

# Conflicts:
#	Dockerfile
parents 31c55335 c43e5b1b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
FROM debian:stretch
FROM debian:stretch-slim
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && \
    apt-get install -y knot-dnsutils knot-host knot-resolver dma bsd-mailx && \
+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@
set -eu
service kresd start
echo 'nameserver 127.0.0.1' > /etc/resolv.conf
exec $@
eval "exec $@"