ci: debian-unstable - remove no longer needed image

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a5fbc8e59a0c583e65a4279cae0a9db8cc22dd6..df685ff8fa71a979070644c5a1194b067845fcbe 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,6 @@ lint:pedantic:
   dependencies: []  # do not download build artifacts
   except:
     - master
-  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_VERSION  # newer Debian for newer compilers
   variables:
     CFLAGS: -Werror -Wall -Wpedantic -ggdb -std=gnu11
   script:
@@ -120,7 +119,6 @@ lint:c:
   stage: test
   except:
     - master
-  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_VERSION  # newer Debian for newer Clang
   dependencies: []  # do not download build artifacts
   script:
     - make lint-c CLANG_TIDY="clang-tidy -quiet"
@@ -131,7 +129,6 @@ lint:clang-scan-build:
   stage: test
   except:
     - master
-  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_VERSION  # newer Debian for newer Clang
   dependencies: []  # do not download build artifacts
   script:
     - MAKEFLAGS="-k -j$(nproc)" SCAN_BUILD="scan-build -o scan-results --status-bugs -no-failure-reports" ./tests/clang_scan_build.sh make || true

diff --git a/ci/README.md b/ci/README.md
index 9d9f5bb5cf9dcdf9229971326ab9e23261989e2a..5fdbc8e103ca409d1dc8a30e218b0e81613f1b68 100644 (file)
--- a/ci/README.md
+++ b/ci/README.md
@@ -1,16 +1,14 @@
 Docker Build
 ------------
 
-* debian-stable / debian-unstable
+* debian-buster
 
 ```
 $ export KNOT_BRANCH=2.7
-$ docker build -t registry.labs.nic.cz/knot/knot-resolver/ci/debian-stable:knot-$KNOT_BRANCH --build-arg KNOT_BRANCH=$KNOT_BRANCH debian-stable
-$ docker build -t registry.labs.nic.cz/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_BRANCH --build-arg KNOT_BRANCH=$KNOT_BRANCH debian-unstable
+$ docker build -t registry.labs.nic.cz/knot/knot-resolver/ci/debian-buster:knot-$KNOT_BRANCH --build-arg KNOT_BRANCH=$KNOT_BRANCH debian-buster
 
 $ docker login registry.labs.nic.cz
-$ docker push registry.labs.nic.cz/knot/knot-resolver/ci/debian-stable:knot-$KNOT_BRANCH
-$ docker push registry.labs.nic.cz/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_BRANCH
+$ docker push registry.labs.nic.cz/knot/knot-resolver/ci/debian-buster:knot-$KNOT_BRANCH
 ```
 
 * fedora

diff --git a/ci/debian-unstable/Dockerfile b/ci/debian-unstable/Dockerfile
deleted file mode 100644 (file)
index 19315d9..0000000
--- a/ci/debian-unstable/Dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM debian:unstable
-MAINTAINER Knot Resolver <knot-resolver@labs.nic.cz>
-ARG KNOT_BRANCH=2.7
-
-WORKDIR /root
-CMD ["/bin/bash"]
-
-# generic cleanup
-RUN apt-get update -qq
-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
-
-# build and install latest version of Knot DNS
-# (kresd depends on libknot and libdnssec)
-RUN git clone --depth=1 --branch=$KNOT_BRANCH https://gitlab.labs.nic.cz/knot/knot-dns.git /tmp/knot
-WORKDIR /tmp/knot
-RUN pwd
-RUN autoreconf -if
-RUN ./configure --prefix=/usr
-RUN make
-RUN make install
-RUN ldconfig
-
-# Valgrind for kresd CI
-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
-
-# Lua lint for kresd CI
-RUN apt-get install luarocks -y -qqq
-RUN luarocks install luacheck
-
-# code coverage
-RUN apt-get install -y -qqq lcov
-RUN luarocks install luacov
-
-# LuaJIT binary for stand-alone scripting
-RUN apt-get install -y -qqq luajit
-
-# clang for kresd CI, version updated as debian updates it
-RUN apt-get install -y -qqq clang clang-tools clang-tidy

diff --git a/ci/debian-unstable/README b/ci/debian-unstable/README
deleted file mode 100644 (file)
index 4dbcd40..0000000
--- a/ci/debian-unstable/README
+++ /dev/null
@@ -1 +0,0 @@
-Docker image based on debian-unstable specifically for newer Clang.