diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2023-07-12 12:07:30 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-07-12 14:58:29 +0000 |
| commit | b9754d58c294db4bce541c127d90603c9bfe2cb0 (patch) | |
| tree | 55737efc0aafc87fc76d80e2c01b7e5764126838 /tools | |
| parent | 189e93f224aa365d476b65dc5693774254b20d8a (diff) | |
all: remove mentions of big-env
Use just env instead of that.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker/README.md | 5 | ||||
| -rw-r--r-- | tools/docker/env/Dockerfile | 2 | ||||
| l--------- | tools/syz-big-env | 1 | ||||
| -rwxr-xr-x | tools/syz-env | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/tools/docker/README.md b/tools/docker/README.md index e52af1c69..384ce326a 100644 --- a/tools/docker/README.md +++ b/tools/docker/README.md @@ -3,11 +3,10 @@ We provide a set of Docker images that provide dev environment suitable for syzkaller development/testing. These images are used by CI, but can also be used for [local development](/docs/contributing.md#using-syz-env). -- [env](/tools/docker/env/Dockerfile) includes Go toolchain, C/C++ cross-compilers, make, git and other essential tools. -- [big-env](/tools/docker/big-env/Dockerfile) includes akaros/fuchsia/netbsd toolchains and gcloud sdk on top of `env` image. +- [env](/tools/docker/env/Dockerfile) includes Go/fuchsia/netbsd toolchains, gcloud sdk, C/C++ cross-compilers, make, git and other essential tools. - [old-env](/tools/docker/old-env/Dockerfile) provides essential tools but based on an older disto (ubuntu:16.04). -These images are available as `gcr.io/syzkaller/{env,big-env,old-env}`, respectively. +These images are available as `gcr.io/syzkaller/{env,old-env}`, respectively. To download and run locally: ``` diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index 2317f8848..d7855c382 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -67,7 +67,7 @@ RUN sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/b # ./build.sh -j72 -m amd64 -U -T ../tools -D ../dest distribution # # To build root image run: -# docker run -it --rm --privileged --device /dev/loop0 gcr.io/syzkaller/big-env +# docker run -it --rm --privileged --device /dev/loop0 gcr.io/syzkaller/env # mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc # create-image.sh -a s390x -d buster diff --git a/tools/syz-big-env b/tools/syz-big-env deleted file mode 120000 index f0d710eb1..000000000 --- a/tools/syz-big-env +++ /dev/null @@ -1 +0,0 @@ -syz-env
\ No newline at end of file diff --git a/tools/syz-env b/tools/syz-env index d41ca1726..296122f58 100755 --- a/tools/syz-env +++ b/tools/syz-env @@ -48,9 +48,7 @@ fi SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)" IMAGE="env" -if [ "$(basename -- "$0")" == "syz-big-env" ]; then - IMAGE="big-env" -elif [ "$(basename -- "$0")" == "syz-old-env" ]; then +if [ "$(basename -- "$0")" == "syz-old-env" ]; then IMAGE="old-env" fi |