From b7ec609c3ccacbfdd3e0e1fccbacfd3675140810 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 16 Oct 2022 21:58:32 +0200 Subject: Docker: T4284: use libbpf-dev from Debian repo over specific commit In order to properly retrieve JSON information in the Smoketests for the new QoS implementation we need a recent (>6.0) version of iproute2. This requires the libbpf-dev package. --- docker/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 14613a87..02311fc8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2021 VyOS maintainers and contributors +# Copyright (C) 2018-2022 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # in order to easy exprort images built to "external" world @@ -344,9 +344,8 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ llvm \ libelf-dev \ libpcap-dev \ + libbpf-dev \ build-essential; \ - git clone https://github.com/libbpf/libbpf.git /tmp/libbpf && \ - cd /tmp/libbpf && git checkout b91f53ec5f1aba2 && cd src && make install; \ fi # Go required for validators and vyos-xe-guest-utilities -- cgit v1.2.3