Skip to content

Commit

Permalink
Merge pull request #424 from akihikodaki/tests
Browse files Browse the repository at this point in the history
Fix tests
  • Loading branch information
giuseppe authored Jun 17, 2024
2 parents a01f52f + d34257c commit 25505d9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Containerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ WORKDIR /build
RUN apk add git make gcc libc-dev musl-dev glib-static gettext eudev-dev \
linux-headers automake autoconf cmake meson ninja clang go-md2man

RUN git clone https://github.com/libfuse/libfuse && \
RUN git clone https://github.com/libfuse/libfuse -b fuse-3.16.2 && \
cd libfuse && \
mkdir build && \
cd build && \
Expand Down
2 changes: 1 addition & 1 deletion Containerfile.static.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ WORKDIR /build
RUN dnf update -y && \
dnf install -y git make automake autoconf gcc glibc-static meson ninja-build clang

RUN git clone https://github.com/libfuse/libfuse && \
RUN git clone https://github.com/libfuse/libfuse -b fuse-3.16.2 && \
cd libfuse && \
mkdir build && \
cd build && \
Expand Down
9 changes: 1 addition & 8 deletions tests/fedora-installs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,10 @@ umount merged
rm -rf workdir lower upper
mkdir upper workdir lower

fuse-overlayfs -o sync=0,lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged

# https://github.com/containers/fuse-overlayfs/issues/86
docker run --rm -v $(pwd)/merged:/merged quay.io/centos/centos:stream8 yum --installroot /merged -y --releasever 8 install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm

umount merged

# fast_ino_check
fuse-overlayfs -o fast_ino_check=1,sync=0,lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged

docker run --rm -v $(pwd)/merged:/merged quay.io/centos/centos:stream8 yum --installroot /merged -y --releasever 8 install nano
docker run --rm -v $(pwd)/merged:/merged fedora dnf --installroot /merged --releasever 30 install -y glibc-common gedit

mkdir merged/a-directory

Expand Down

0 comments on commit 25505d9

Please sign in to comment.