From 04129e0a2c9b346fc1bf3e8dc7c7d78a04f828f2 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 3 Dec 2017 16:26:19 +0200
Subject: [PATCH] Use the czin/knots image as base (uses Alpine Linux).
---
.dockerignore | 3 +++
Dockerfile | 21 +++++++++++++--------
README.md | 1 -
entrypoint.sh => entrypoint | 2 +-
4 files changed, 17 insertions(+), 10 deletions(-)
create mode 100644 .dockerignore
rename entrypoint.sh => entrypoint (59%)
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..4160180
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+.git/
+README*
+*.swp
diff --git a/Dockerfile b/Dockerfile
index f4caaf9..198bd5a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,13 @@
-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 && \
- rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/bin/bash", "--login"]
+FROM cznic/knot-resolver
+RUN echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \
+ apk add --update \
+ dma@testing \
+ iproute2 \
+ knot-utils \
+ mailx \
+ mtr \
+ && \
+ rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
+COPY entrypoint /entrypoint
+ENTRYPOINT [ "/entrypoint" ]
+CMD [ "bash", "--login" ]
diff --git a/README.md b/README.md
index a64614d..cf851a8 100644
--- a/README.md
+++ b/README.md
@@ -5,5 +5,4 @@ https://www.shore.co.il/blog/resolver/.
## Usage
- docker pull adarnimrod/resolver
docker run -it adarnimrod/resolver
diff --git a/entrypoint.sh b/entrypoint
similarity index 59%
rename from entrypoint.sh
rename to entrypoint
index f7dc300..6523ccb 100755
--- a/entrypoint.sh
+++ b/entrypoint
@@ -1,5 +1,5 @@
#!/bin/sh
set -eu
-service kresd start
+echo "net = { '127.0.0.1', '::1'}" | nohup kresd -f1 &
echo 'nameserver 127.0.0.1' > /etc/resolv.conf
eval "exec $@"
--
GitLab