diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2023-07-12 15:19:12 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-07-12 14:58:29 +0000 |
| commit | 73162bc03a311edc88ae7ae64fcdd82334aa388e (patch) | |
| tree | 6a3e4607b277c4a5977a0dad4357aeac8b240afa /tools/docker | |
| parent | 6332e12f727518f77db28570014465d552d5f38f (diff) | |
tools/docker/env: use the default git
As we're using a new Debian image now, there's no sense to take git from
backports. It's new enough.
Diffstat (limited to 'tools/docker')
| -rw-r--r-- | tools/docker/env/Dockerfile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index de6d8b3d7..db4e87025 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -13,7 +13,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends 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-12-dev lib32stdc++-12-dev \ - python3 python-is-python3 \ + python3 python-is-python3 git \ # 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. @@ -46,11 +46,6 @@ 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 |