Run valgrind CI checks with new docker image

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 832fbbba8fc9a9ace28a1aae6156ff3ab5909927..58ceb2a4a78df0963ef45e6e01a706cf08db0049 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,6 @@ deckard:linux:amd64:
     - amd64
 
 test:linux:amd64:valgrind:
-  image: cznic/ubuntu-valgrind:16.04
   stage: test
   script:
     - PREFIX=$(pwd)/.local DEBUGGER="valgrind --error-exitcode=1 --leak-check=full --trace-children=yes --quiet" make -k check

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 28d7c57edfa94f3bde48d1f9166db3d4a7856e65..475b2f60d71c15cd9bca64c5e26ccdd886617076 100644 (file)
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -9,5 +9,8 @@ RUN apt-get update -qq
 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 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
 RUN cd /tmp/knot && autoreconf -if && ./configure && make && make install && ldconfig

diff --git a/ci/valgrind/Dockerfile b/ci/valgrind/Dockerfile
deleted file mode 100644 (file)
index 79e13bd..0000000
--- a/ci/valgrind/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM cznic/ubuntu:16.04
-MAINTAINER Knot DNS <knot-dns@labs.nic.cz>
-
-WORKDIR /root
-CMD ["/bin/bash"]
-
-# name: cznic/ubuntu-valgrind:16.04
-# run ci tests with valgrind memory checks
-RUN apt-get update
-RUN apt-get upgrade -y
-RUN apt-get install -y valgrind