diff options
| author | Florent Revest <revest@chromium.org> | 2024-11-28 13:45:29 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-11-29 14:35:32 +0000 |
| commit | b5d2be89685d997057176b6647393ba33b431d78 (patch) | |
| tree | 146ae160ed24a3a1627478469251ddcf316e8520 /tools/docker | |
| parent | 2c633c86520193693e3e2fab35f7115e5ac7f747 (diff) | |
tools/docker: add various fsck-like commands to the environment
As part of #5518, I'm adding fsck logs as annotation to the mounted
file system assets. For this, I need a variety of fsck-like commands in
the ci environment as well as eventually in the production environment.
Diffstat (limited to 'tools/docker')
| -rw-r--r-- | tools/docker/env/Dockerfile | 4 | ||||
| -rw-r--r-- | tools/docker/syzbot/Dockerfile | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index 4d14ac5ea..ce993adbb 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -18,6 +18,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends flex bison bc libelf-dev libssl-dev \ # qemu-user is required to run alien arch binaries in pkg/cover tests. qemu-user \ + # These are various fsck-like commands needed for prog/fsck: + dosfstools e2fsprogs btrfs-progs util-linux f2fs-tools jfsutils \ + util-linux dosfstools ocfs2-tools reiserfsprogs xfsprogs erofs-utils \ + exfatprogs gfs2-utils \ && \ apt-get -y autoremove && \ apt-get clean autoclean && \ diff --git a/tools/docker/syzbot/Dockerfile b/tools/docker/syzbot/Dockerfile index fff23e3d5..717cbaa61 100644 --- a/tools/docker/syzbot/Dockerfile +++ b/tools/docker/syzbot/Dockerfile @@ -17,6 +17,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q \ apt-transport-https curl gnupg python-is-python3 \ # Needed for building Cuttlefish images. rsync libarchive-tools \ + # These are various fsck-like commands needed for prog/fsck: + dosfstools e2fsprogs btrfs-progs util-linux f2fs-tools jfsutils \ + util-linux dosfstools ocfs2-tools reiserfsprogs xfsprogs erofs-utils \ + exfatprogs gfs2-utils \ # Needed for buiding gVisor. crossbuild-essential-amd64 crossbuild-essential-arm64 libbpf-dev RUN test "$(uname -m)" != x86_64 && exit 0 || \ |