From: Vladimír Čunát Date: Thu, 15 Jul 2021 17:27:12 +0000 (+0200) Subject: ci/debian-*/Dockerfile: fix build with KNOT_BRANCH=master X-Git-Tag: v5.4.0~5^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9fd81ba148d7c4971f5445c26e501d201934132;p=thirdparty%2Fknot-resolver.git ci/debian-*/Dockerfile: fix build with KNOT_BRANCH=master The go stuff probably never worked on buster and we just forgot to test. --- diff --git a/ci/debian-11/Dockerfile b/ci/debian-11/Dockerfile index 5caf9addf..5f2a51131 100644 --- a/ci/debian-11/Dockerfile +++ b/ci/debian-11/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update -qq RUN apt-get install -y -qqq git make cmake pkg-config meson \ build-essential bsdmainutils libtool autoconf libcmocka-dev \ liburcu-dev libgnutls28-dev libedit-dev liblmdb-dev libcap-ng-dev libsystemd-dev \ - libelf-dev libidn11-dev libuv1-dev \ + libelf-dev libmnl-dev libidn11-dev libuv1-dev \ libluajit-5.1-dev lua-http libssl-dev libnghttp2-dev # Build and testing deps for Resolver's dnstap module (go stuff is just for testing) diff --git a/ci/debian-buster/Dockerfile b/ci/debian-buster/Dockerfile index bc215c28a..626493506 100644 --- a/ci/debian-buster/Dockerfile +++ b/ci/debian-buster/Dockerfile @@ -18,14 +18,16 @@ RUN apt-get update -qq RUN apt-get install -y -qqq git make cmake pkg-config meson \ build-essential bsdmainutils libtool autoconf libcmocka-dev \ liburcu-dev libgnutls28-dev libedit-dev liblmdb-dev libcap-ng-dev libsystemd-dev \ - libelf-dev libidn11-dev libuv1-dev \ + libelf-dev libmnl-dev libidn11-dev libuv1-dev \ libluajit-5.1-dev lua-http libssl-dev libnghttp2-dev # Build and testing deps for Resolver's dnstap module (go stuff is just for testing) RUN apt-get install -y -qqq \ protobuf-c-compiler libprotobuf-c-dev libfstrm-dev \ golang-any -RUN bash -c "go get github.com/{FiloSottile/gvt,cloudflare/dns,dnstap/golang-dnstap}" +# Some stuff won't work on buster: +# package crypto/ed25519: unrecognized import path "crypto/ed25519" +#RUN bash -c "go get github.com/{FiloSottile/gvt,cloudflare/dns,dnstap/golang-dnstap}" # documentation dependecies RUN apt-get install -y -qqq doxygen python3-sphinx python3-breathe python3-sphinx-rtd-theme