diff options
| author | Marco Vanotti <mvanotti@users.noreply.github.com> | 2023-05-03 16:53:18 -0400 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2023-05-04 11:28:13 +0200 |
| commit | 44cadb8c63089bc856779dc81dc1b3df8de361ed (patch) | |
| tree | 32037a73cd7c82fe3d37522d6d138334b5b5ce7d /tools/docker/env | |
| parent | b6b1ed1a3d5eb8e0257c0996339e6e23b643863d (diff) | |
tools/docker: update git version
The git version used in bullseye is too old and is not compatible with
Fuchsia. This change modifies the dockerfile to install git from
bullseye-backports, which is more recent.
Diffstat (limited to 'tools/docker/env')
| -rw-r--r-- | tools/docker/env/Dockerfile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index d6dda4c90..8620eb0be 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -9,7 +9,7 @@ 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 git curl ca-certificates binutils g++ \ + sudo make python 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 \ @@ -47,6 +47,11 @@ RUN sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++ RUN sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 100 RUN sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 100 +# The default git is too old, install a newer one. +RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list +RUN apt-get update --allow-releaseinfo-change +RUN apt-get install -y -q --no-install-recommends git/bullseye-backports + # The default Docker prompt is too ugly and takes the whole line: # I have no name!@0f3331d2fb54:~/gopath/src/github.com/google/syzkaller$ RUN echo "export PS1='syz-env🈴 '" > /syzkaller/.bashrc |