Skip to content

Commit b5d2be8

Browse files
FlorentRevesta-nogikh
authored andcommitted
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.
1 parent 2c633c8 commit b5d2be8

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

tools/docker/env/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends
1818
flex bison bc libelf-dev libssl-dev \
1919
# qemu-user is required to run alien arch binaries in pkg/cover tests.
2020
qemu-user \
21+
# These are various fsck-like commands needed for prog/fsck:
22+
dosfstools e2fsprogs btrfs-progs util-linux f2fs-tools jfsutils \
23+
util-linux dosfstools ocfs2-tools reiserfsprogs xfsprogs erofs-utils \
24+
exfatprogs gfs2-utils \
2125
&& \
2226
apt-get -y autoremove && \
2327
apt-get clean autoclean && \

tools/docker/syzbot/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
1717
apt-transport-https curl gnupg python-is-python3 \
1818
# Needed for building Cuttlefish images.
1919
rsync libarchive-tools \
20+
# These are various fsck-like commands needed for prog/fsck:
21+
dosfstools e2fsprogs btrfs-progs util-linux f2fs-tools jfsutils \
22+
util-linux dosfstools ocfs2-tools reiserfsprogs xfsprogs erofs-utils \
23+
exfatprogs gfs2-utils \
2024
# Needed for buiding gVisor.
2125
crossbuild-essential-amd64 crossbuild-essential-arm64 libbpf-dev
2226
RUN test "$(uname -m)" != x86_64 && exit 0 || \

0 commit comments

Comments
 (0)