diff options
| author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2022-10-10 15:59:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2022-10-10 15:59:41 +0200 |
| commit | 0035608bb18b13a325d66dd08e90c295b6571057 (patch) | |
| tree | 0c0fdbcc9c9c2a9b6aa3457c4d08b855884c35e9 /ci | |
| parent | Merge branch 'release-5.5.3' into 'master' (diff) | |
| parent | ci/images/debian-11: drop go (diff) | |
| download | knot-resolver-0035608bb18b13a325d66dd08e90c295b6571057.tar.xz knot-resolver-0035608bb18b13a325d66dd08e90c295b6571057.zip | |
Merge !1348: ci/images/debian-11: drop go
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/images/debian-11/Dockerfile | 7 | ||||
| -rw-r--r-- | ci/images/lxc-debian-11/Dockerfile | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ci/images/debian-11/Dockerfile b/ci/images/debian-11/Dockerfile index be22a2ad..4ed7cff6 100644 --- a/ci/images/debian-11/Dockerfile +++ b/ci/images/debian-11/Dockerfile @@ -21,9 +21,10 @@ RUN apt-get install -y -qqq git make cmake pkg-config meson \ # 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,golang/protobuf/proto}" + protobuf-c-compiler libprotobuf-c-dev libfstrm-dev +# Maintaining the go stuff in CI really seems more trouble than worth. +# golang-any +#RUN bash -c "go get github.com/{FiloSottile/gvt,cloudflare/dns,dnstap/golang-dnstap,golang/protobuf/proto}" # documentation dependencies RUN apt-get install -y -qqq doxygen python3-sphinx python3-breathe python3-sphinx-rtd-theme diff --git a/ci/images/lxc-debian-11/Dockerfile b/ci/images/lxc-debian-11/Dockerfile index 663c6094..82b0ad6b 100644 --- a/ci/images/lxc-debian-11/Dockerfile +++ b/ci/images/lxc-debian-11/Dockerfile @@ -18,9 +18,10 @@ RUN apt-get install -y -qqq git make cmake pkg-config meson \ # 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,golang/protobuf/proto}" + protobuf-c-compiler libprotobuf-c-dev libfstrm-dev +# Maintaining the go stuff in CI really seems more trouble than worth. +# golang-any +#RUN bash -c "go get github.com/{FiloSottile/gvt,cloudflare/dns,dnstap/golang-dnstap,golang/protobuf/proto}" # documentation dependencies RUN apt-get install -y -qqq doxygen python3-sphinx python3-breathe python3-sphinx-rtd-theme |