diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2023-07-10 19:57:57 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-07-11 13:39:36 +0000 |
| commit | d7389d938d9983ed7a2a91e6b5f54eb35690d74e (patch) | |
| tree | 4c5a72fad354cea88da4e16b370e3f331ece8801 /tools/docker/env | |
| parent | 50356e13638d57243e5192d053937420ef697bd5 (diff) | |
tools/docker: update to bookworm images
Closes #3973.
As Python 2.7 is no longer present in the packages, build it directly in
Dockerfile. It's rather small and doesn't take much time.
Diffstat (limited to 'tools/docker/env')
| -rw-r--r-- | tools/docker/env/Dockerfile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index 8620eb0be..de6d8b3d7 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -3,16 +3,17 @@ # See /tools/docker/README.md for details. -FROM debian:bullseye +FROM debian:bookworm LABEL homepage="https://github.com/google/syzkaller" RUN apt-get update --allow-releaseinfo-change RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends \ - sudo make python nano unzip curl ca-certificates binutils g++ \ + sudo make nano unzip curl ca-certificates binutils g++ \ g++-arm-linux-gnueabi g++-aarch64-linux-gnu g++-powerpc64le-linux-gnu \ g++-mips64el-linux-gnuabi64 g++-s390x-linux-gnu g++-riscv64-linux-gnu \ - libc6-dev-i386 libc6-dev-i386-amd64-cross lib32gcc-10-dev lib32stdc++-10-dev \ + libc6-dev-i386 libc6-dev-i386-amd64-cross lib32gcc-12-dev lib32stdc++-12-dev \ + python3 python-is-python3 \ # These are needed to build Linux kernel: flex bison bc libelf-dev libssl-dev \ # qemu-user is required to run alien arch binaries in pkg/cover tests. @@ -34,12 +35,10 @@ RUN mkdir -p /syzkaller/gopath/src/github.com/google/syzkaller && \ mkdir -p /syzkaller/.cache && \ chmod -R 0777 /syzkaller -# The default clang-11 is too old, install the latest one. RUN apt-get install -y -q gnupg software-properties-common apt-transport-https RUN curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -RUN add-apt-repository "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-15 main" +RUN add-apt-repository "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-15 main" RUN apt-get update --allow-releaseinfo-change -RUN apt-get remove -y -q clang-11 RUN apt-get install -y -q --no-install-recommends clang-15 clang-format-15 clang-tidy-15 RUN apt autoremove -y -q RUN sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 100 |