diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2022-01-17 13:43:52 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2022-01-19 09:11:05 +0100 |
| commit | e3995b169b7bbb2ff742cdca74f005b34f4c6225 (patch) | |
| tree | 9d6eeba08304bf5408e5754556f26162179763ec /tools/docker/old-env | |
| parent | 71b4fe77183520ae6eee0c22e8df37927529d872 (diff) | |
tools/docker/old-env: don't use --allow-releaseinfo-change
This flag is needed for Bullseye that we use in env/syzbot containers.
I proactively added it to old-env as well assuming it's version-independent flag.
But Ubuntu 16.04 does not like this flag:
E: Command line option --allow-releaseinfo-change is not understood in combination with the other options
The command '/bin/sh -c apt-get update --allow-releaseinfo-change' returned a non-zero code: 100
Remove it from old-env.
Diffstat (limited to 'tools/docker/old-env')
| -rw-r--r-- | tools/docker/old-env/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/docker/old-env/Dockerfile b/tools/docker/old-env/Dockerfile index c5a235ec5..2089b3038 100644 --- a/tools/docker/old-env/Dockerfile +++ b/tools/docker/old-env/Dockerfile @@ -7,7 +7,7 @@ FROM ubuntu:16.04 LABEL homepage="https://github.com/google/syzkaller" -RUN dpkg --add-architecture i386 && apt-get update --allow-releaseinfo-change +RUN dpkg --add-architecture i386 && apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends \ sudo make nano git curl ca-certificates gnupg \ apt-transport-https software-properties-common g++ \ @@ -27,7 +27,7 @@ ENV GOPATH /gopath # The distro-provided clang is too old for Go fuzzing. RUN curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - RUN add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main" -RUN apt-get update --allow-releaseinfo-change +RUN apt-get update RUN apt-get install -y -q --no-install-recommends clang-10 RUN ln -s /usr/bin/clang-10 /usr/bin/clang |