revert the changes in Dockerfile.ubuntu2004; we use 2204 for coverage
@@ -2,24 +2,27 @@ FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update --yes && apt-get install --yes \
+RUN apt-get --yes update
+RUN apt-get install --yes \
apache2-utils \
bison \
+ clang \
cmake \
cmake-data \
dnsutils \
flex \
git \
- lsb-release \
libbrotli-dev \
libc-ares-dev \
libcap-dev \
+ libclang-dev \
libedit-dev \
libelf-dev \
libev-dev \
libssl-dev \
libuv1-dev \
- llvm-7 \
+ llvm-dev \
+ libllvm7 \
llvm-7-dev \
libclang-7-dev \
zlib1g-dev \
@@ -38,18 +41,6 @@ RUN apt-get update --yes && apt-get install --yes \
time \
wget
-# the latest version of clang and llvm are required for LLVM source-based code coverage, but they cannot be used to build bpftrace.
-RUN apt-get install --yes gnupg \
- && wget --quiet --https-only -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add \
- && echo "deb http://apt.llvm.org/$(lsb_release -sc)/ llvm-toolchain-$(lsb_release -sc)-14 main" > /etc/apt/sources.list.d/llvm.list \
- && apt-get update --yes \
- && apt-get install --yes \
- clang-14 \
- libclang-14-dev \
- llvm-14 \
- llvm-14-dev
-ENV PATH="/usr/lib/llvm-14/bin:$PATH"
-
# curl with http2 support
RUN apt-get install --yes libnghttp2-dev \
&& wget --no-verbose -O - https://curl.haxx.se/download/curl-7.81.0.tar.gz | tar xzf - \
@@ -74,7 +65,7 @@ RUN cpanm -n Test::More Starlet Protocol::HTTP2 Net::DNS::Nameserver Test::TCP
# h2spec
RUN curl -Ls https://github.com/summerwind/h2spec/releases/download/v2.6.0/h2spec_linux_amd64.tar.gz | tar zx -C /usr/local/bin
-# bcc and bpftrace (depending on llvm-7)
+# bcc and bpftrace
RUN apt-get install --yes \
libbpfcc-dev
RUN git clone --branch kazuho/usdt-attach-all-locations https://github.com/kazuho/bpftrace.git && \
