From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 27 Jul 2018 10:52:44 +0000 (+0200)
Subject: ci/debian-unstable: simplify image
X-Git-Tag: v2.4.1~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab483cb21104270efecfbf5f3787231e4d6d059c;p=thirdparty%2Fknot-resolver.git

ci/debian-unstable: simplify image
---

diff --git a/ci/debian-unstable/Dockerfile b/ci/debian-unstable/Dockerfile
index 736141db3..69a2932d7 100644
--- a/ci/debian-unstable/Dockerfile
+++ b/ci/debian-unstable/Dockerfile
@@ -11,20 +11,6 @@ RUN apt-get upgrade -y -qqq
 # Knot and Knot Resolver dependecies
 RUN apt-get install -y -qqq make cmake pkg-config git build-essential bsdmainutils libtool autoconf liburcu-dev libgnutls28-dev libedit-dev liblmdb-dev libcap-ng-dev libsystemd-dev libidn11-dev protobuf-c-compiler libfstrm-dev libuv1-dev libcmocka-dev libluajit-5.1-dev lua-sec lua-socket lua-http
 
-# Python packags required for Deckard CI
-# Python: grab latest versions from PyPi
-# (dnspython and Augeas binding in Debian packages are slow and buggy)
-RUN apt-get install -y -qqq python3-pip wget
-RUN pip3 install --upgrade pip
-RUN pip3 install pylint
-RUN pip3 install pep8
-
-# C dependencies for python-augeas
-RUN apt-get install -y -qqq libaugeas-dev libffi-dev
-# Python dependencies for Deckard
-RUN wget https://gitlab.labs.nic.cz/knot/deckard/raw/master/requirements.txt -O /tmp/deckard-req.txt
-RUN pip3 install -r /tmp/deckard-req.txt
-
 # build and install latest version of Knot DNS
 # (kresd depends on libknot and libdnssec)
 RUN git clone --depth=1 --branch=2.6 https://gitlab.labs.nic.cz/knot/knot-dns.git /tmp/knot
@@ -37,7 +23,7 @@ RUN make install
 RUN ldconfig
 
 # Valgrind for kresd CI
-RUN apt-get install valgrind -y -qqq
+RUN apt-get install valgrind wget -y -qqq
 RUN wget https://raw.githubusercontent.com/LuaJIT/LuaJIT/v2.0.4/src/lj.supp -O /lj.supp
 # TODO: rebuild LuaJIT with Valgrind support
 
@@ -45,21 +31,6 @@ RUN wget https://raw.githubusercontent.com/LuaJIT/LuaJIT/v2.0.4/src/lj.supp -O /
 RUN apt-get install luarocks -y -qqq
 RUN luarocks install luacheck
 
-# respdiff for kresd CI
-RUN git clone --depth=1 https://gitlab.labs.nic.cz/knot/respdiff /var/opt/respdiff
-RUN pip3 install -r /var/opt/respdiff/requirements.txt
-
-# Unbound for respdiff
-RUN apt-get install unbound unbound-anchor -y -qqq
-RUN printf "server:\n interface: 127.0.0.1@53535\n use-syslog: yes\nremote-control:\n control-enable: no\n" >> /etc/unbound/unbound.conf
-
-# BIND for respdiff
-RUN apt-get install bind9 -y -qqq
-RUN printf 'options {\n directory "/var/cache/bind";\n listen-on port 53533 { 127.0.0.1; };\n listen-on-v6 port 53533 { ::1; };\n};\n' > /etc/bind/named.conf.options
-
-# PowerDNS Recursor for Deckard CI
-RUN apt-get install pdns-recursor -y -qqq
-
 # code coverage
 RUN apt-get install -y -qqq lcov
 RUN luarocks install luacov
diff --git a/ci/debian-unstable/README b/ci/debian-unstable/README
index 709a81a54..4dbcd407a 100644
--- a/ci/debian-unstable/README
+++ b/ci/debian-unstable/README
@@ -1,4 +1 @@
-Clang in Debian stable is old so we have separate image with Clang.
-This Dockerfile should be the same as ci/Dockerfile, with two differences:
-- FROM points to debian:unstable
-- last step adds Clang and its analysis tools
+Docker image based on debian-unstable specifically for newer Clang.