Merge pull request #240 from giuseppe/rename-dockerfiles

build: rename Dockerfile to Containerfile
This commit is contained in:
Daniel J Walsh 2020-10-07 11:02:28 -04:00 committed by GitHub
commit 1760775f99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 5 additions and 5 deletions

View File

@ -20,8 +20,8 @@ jobs:
run: | run: |
./buildx create --name cross --platform=amd64,arm,arm64,s390x,ppc64le --use ./buildx create --name cross --platform=amd64,arm,arm64,s390x,ppc64le --use
./buildx inspect --bootstrap ./buildx inspect --bootstrap
- name: "Build binaries from Dockerfile.cross" - name: "Build binaries from Containerfile.cross"
run: ./buildx build -o /tmp --platform=amd64,arm64,arm,s390x,ppc64le -f Dockerfile.cross . run: ./buildx build -o /tmp --platform=amd64,arm64,arm,s390x,ppc64le -f Containerfile.cross .
- name: "Create /tmp/artifact" - name: "Create /tmp/artifact"
run: | run: |
mkdir -p /tmp/artifact mkdir -p /tmp/artifact

View File

@ -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` * 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)) (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): 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: 5. Copy the resulting binary to your host:

View File

@ -4,7 +4,7 @@ cd "$(dirname "$0")"
set -ex 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 \ docker run --privileged --rm --entrypoint /unlink.sh -w /tmp \
-e EXPECT_UMOUNT_STATUS=1 \ -e EXPECT_UMOUNT_STATUS=1 \