diff options
| author | Alexander Potapenko <glider@google.com> | 2022-02-11 17:58:43 +0100 |
|---|---|---|
| committer | Alexander Potapenko <ramosian.glider@gmail.com> | 2022-02-11 18:45:41 +0100 |
| commit | 8b9ca619df135211a89cc19719f2705d0016045d (patch) | |
| tree | 9f52f6ec0264cdb13cce5a999466a660c3316ce5 /tools/docker | |
| parent | 0b33604d8e2793b82ec89abecf82d92b82e3d410 (diff) | |
docker: make clang-kmsan hermetic
The existing build lacked some headers, which prevented us from being
able to configure newer kernels.
Diffstat (limited to 'tools/docker')
| -rw-r--r-- | tools/docker/env/Dockerfile | 5 | ||||
| -rw-r--r-- | tools/docker/syzbot/Dockerfile | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index 831471c5b..3e43cfef7 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -37,8 +37,9 @@ RUN mkdir -p /syzkaller/gopath/src/github.com/google/syzkaller && \ # Download and install the custom Clang required to build KMSAN. # TODO(@ramosian-glider): switch to stable Clang once KMSAN is upstreamed. -RUN curl https://storage.googleapis.com/syzkaller/clang-2b554920f11c-patched.tar.gz | tar -C /syzkaller -xz -RUN ln -s /syzkaller/clang-2b554920f11c-patched /syzkaller/clang-kmsan +ENV CLANG_KMSAN_VER 38e16e1cebb8 +RUN curl https://storage.googleapis.com/syzkaller/clang-${CLANG_KMSAN_VER}.tar.gz | tar -C /usr/local/ -xz +RUN ln -s /usr/local/clang-${CLANG_KMSAN_VER} /usr/local/clang-kmsan # The default Docker prompt is too ugly and takes the whole line: # I have no name!@0f3331d2fb54:~/gopath/src/github.com/google/syzkaller$ diff --git a/tools/docker/syzbot/Dockerfile b/tools/docker/syzbot/Dockerfile index 339b7fa65..7c4f2aad8 100644 --- a/tools/docker/syzbot/Dockerfile +++ b/tools/docker/syzbot/Dockerfile @@ -34,9 +34,9 @@ ENV PATH /usr/local/go/bin:$PATH # Download and install the custom Clang required to build KMSAN. # TODO(@ramosian-glider): switch to stable Clang once KMSAN is upstreamed. -RUN mkdir -p /syzkaller -RUN curl https://storage.googleapis.com/syzkaller/clang-2b554920f11c-patched.tar.gz | tar -C /syzkaller -xz -RUN ln -s /syzkaller/clang-2b554920f11c-patched /syzkaller/clang-kmsan +ENV CLANG_KMSAN_VER 38e16e1cebb8 +RUN curl https://storage.googleapis.com/syzkaller/clang-${CLANG_KMSAN_VER}.tar.gz | tar -C /usr/local/ -xz +RUN ln -s /usr/local/clang-${CLANG_KMSAN_VER} /usr/local/clang-kmsan # Not really GRTE, but it's enough to run some scripts that hardcode the path. RUN mkdir -p /usr/grte/v5/bin && ln -s /usr/bin/python3 /usr/grte/v5/bin/python2.7 |