Skip to content
Snippets Groups Projects
Commit 9491aa50 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' into knot 

# Conflicts:
#	Dockerfile
parents 31c55335 c43e5b1b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Dockerfile
+ 1
− 1
View file @ 9491aa50
FROM debian:stretch FROM debian:stretch-slim
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y knot-dnsutils knot-host knot-resolver dma bsd-mailx && \ apt-get install -y knot-dnsutils knot-host knot-resolver dma bsd-mailx && \
......
entrypoint.sh
+ 1
− 1
View file @ 9491aa50
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
set -eu set -eu
service kresd start service kresd start
echo 'nameserver 127.0.0.1' > /etc/resolv.conf echo 'nameserver 127.0.0.1' > /etc/resolv.conf
exec $@ eval "exec $@"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment