From: Štěpán Kotek <stepan.kotek@gmail.com>
Date: Wed, 27 Sep 2017 12:39:26 +0000 (+0200)
Subject: Run deckard CI checks in new docker image
X-Git-Tag: v1.99.1-alpha~5^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01a19c45ec1630f29134573987125e5b80695365;p=thirdparty%2Fknot-resolver.git

Run deckard CI checks in new docker image
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58ceb2a4a..871ff5f7a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,11 +32,6 @@ test:linux:amd64:
 deckard:linux:amd64:
   stage: test
   script:
-    - apt purge -y python-dnspython python3-dnspython
-    - apt update
-    - apt install -y python3-jinja2 python3-pip python3-yaml libffi-dev libaugeas-dev
-    - pip3 install --upgrade pip
-    - pip3 install --user dnspython python-augeas
     - PREFIX=$(pwd)/.local MAKEFLAGS="--jobs $(nproc) --keep-going" make check-integration
   dependencies:
     - build:linux:amd64
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 475b2f60d..fd850d1fb 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -10,6 +10,7 @@ RUN apt-get install -y -qqq apt-utils
 RUN apt-get upgrade -y -qqq
 RUN apt-get install -y -qqq make cmake pkg-config git build-essential bsdmainutils libtool autoconf make pkg-config liburcu-dev libgnutls28-dev libedit-dev liblmdb-dev libcap-ng-dev libsystemd-dev libidn11-dev protobuf-c-compiler libfstrm-dev pkg-config libknot-dev libuv1-dev libcmocka-dev libluajit-5.1-dev # dependencies for knot-resolver
 RUN apt-get install -y -qqq valgrind python3 python3-dev python3-jinja2 python3-pip python3-yaml libffi-dev libaugeas-dev
+RUN apt-get purge python3-dnspython
 RUN pip3 install --upgrade pip
 RUN pip3 install --user dnspython python-augeas
 RUN git clone https://gitlab.labs.nic.cz/knot/knot-dns.git /tmp/knot