From a65b3105087e4d9b985f7a7033844530fc4321c1 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 6 Oct 2020 19:22:47 +0200 Subject: [PATCH] build: rename Dockerfile to Containerfile since these files need the -v option that is not present with Docker, rename the files to Containerfile to avoid confusion. more info: https://twitter.com/cpuguy83/status/1313523894536429568 Signed-off-by: Giuseppe Scrivano --- .github/workflows/release.yaml | 4 ++-- Dockerfile.alpine => Containerfile.alpine | 0 Dockerfile.cross => Containerfile.cross | 0 Dockerfile.static.fedora => Containerfile.static.fedora | 0 Dockerfile.static.ubuntu => Containerfile.static.ubuntu | 0 README.md | 4 ++-- tests/alpine.sh | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename Dockerfile.alpine => Containerfile.alpine (100%) rename Dockerfile.cross => Containerfile.cross (100%) rename Dockerfile.static.fedora => Containerfile.static.fedora (100%) rename Dockerfile.static.ubuntu => Containerfile.static.ubuntu (100%) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 86596e3..f123386 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,8 +20,8 @@ jobs: run: | ./buildx create --name cross --platform=amd64,arm,arm64,s390x,ppc64le --use ./buildx inspect --bootstrap - - name: "Build binaries from Dockerfile.cross" - run: ./buildx build -o /tmp --platform=amd64,arm64,arm,s390x,ppc64le -f Dockerfile.cross . + - name: "Build binaries from Containerfile.cross" + run: ./buildx build -o /tmp --platform=amd64,arm64,arm,s390x,ppc64le -f Containerfile.cross . - name: "Create /tmp/artifact" run: | mkdir -p /tmp/artifact diff --git a/Dockerfile.alpine b/Containerfile.alpine similarity index 100% rename from Dockerfile.alpine rename to Containerfile.alpine diff --git a/Dockerfile.cross b/Containerfile.cross similarity index 100% rename from Dockerfile.cross rename to Containerfile.cross diff --git a/Dockerfile.static.fedora b/Containerfile.static.fedora similarity index 100% rename from Dockerfile.static.fedora rename to Containerfile.static.fedora diff --git a/Dockerfile.static.ubuntu b/Containerfile.static.ubuntu similarity index 100% rename from Dockerfile.static.ubuntu rename to Containerfile.static.ubuntu diff --git a/README.md b/README.md index fbd3b80..6f889cb 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,11 @@ the install script will usually create the device automatically; or * manually create the device with the command `mknod /dev/fuse -m 0666 c 10 229` (see [this code](https://github.com/libfuse/libfuse/blob/f0e08cc700d629da2d46def8b620b0ed858cc0d9/util/install_helper.sh#L35)) -3. Clone this repository, and switch to the top-level folder containing the file "`Dockerfile.static.ubuntu`"; +3. Clone this repository, and switch to the top-level folder containing the file "`Containerfile.static.ubuntu`"; 4. Launch the build with the command (note the single dot `.` at the end): ``` -buildah bud -v $PWD:/build/fuse-overlayfs -t fuse-overlayfs -f ./Dockerfile.static.ubuntu . +buildah bud -v $PWD:/build/fuse-overlayfs -t fuse-overlayfs -f ./Containerfile.static.ubuntu . ``` 5. Copy the resulting binary to your host: diff --git a/tests/alpine.sh b/tests/alpine.sh index 2ce45ed..dec0bdc 100755 --- a/tests/alpine.sh +++ b/tests/alpine.sh @@ -4,7 +4,7 @@ cd "$(dirname "$0")" set -ex -docker build -t fuse-overlayfs:alpine -f ../Dockerfile.alpine .. +docker build -t fuse-overlayfs:alpine -f ../Containerfile.alpine .. docker run --privileged --rm --entrypoint /unlink.sh -w /tmp \ -e EXPECT_UMOUNT_STATUS=1 \