From c7963db36944a914e554830ea4ab5e703968386a Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Mon, 21 Dec 2020 11:19:56 -0500 Subject: [PATCH] Spelling Signed-off-by: Josh Soref --- CONTRIBUTING.md | 2 +- cmd/buildah/common.go | 2 +- cmd/buildah/containers_test.go | 4 ++-- cmd/buildah/images_test.go | 6 +++--- config.go | 2 +- .../buildahimage/stablebyhand/Containerfile.buildahstable | 2 +- contrib/cirrus/lib.sh | 2 +- copier/copier.go | 2 +- demos/buildah_multi_stage.sh | 4 ++-- docs/buildah-add.md | 2 +- docs/buildah-bud.md | 6 +++--- docs/buildah-copy.md | 2 +- docs/buildah-from.md | 4 ++-- docs/buildah-logout.md | 4 ++-- docs/buildah-run.md | 2 +- docs/release-announcements/v0.12.md | 2 +- docs/tutorials/01-intro.md | 2 +- docs/tutorials/03-on-build.md | 2 +- docs/tutorials/05-openshift-rootless-bud.md | 2 +- hack/build_speed.sh | 2 +- pkg/parse/parse.go | 2 +- run.go | 2 +- run_linux.go | 4 ++-- tests/authenticate.bats | 6 +++--- tests/bud.bats | 8 ++++---- tests/commit.bats | 4 ++-- tests/conformance/conformance_test.go | 2 +- tests/e2e/buildah_suite_test.go | 4 ++-- tests/from.bats | 4 ++-- tests/helpers.bash | 2 +- tests/lists.bats | 4 ++-- tests/pull.bats | 6 +++--- tests/push.bats | 4 ++-- tests/test_buildah_build_rpm.sh | 2 +- 34 files changed, 55 insertions(+), 55 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e5171f8a4..57f82191e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,7 +37,7 @@ Once you have decided to contribute to Buildah by working on an issue, check our backlog of [open issues](https://github.com/containers/buildah/issues) looking for any that do not have an "In Progress" label attached to it. Often issues will be assigned to someone, to be worked on at a later time. If you have the -time to work on the issue now add yourself as an assignee, and set the +time to work on the issue now, add yourself as an assignee, and set the "In Progress" label if you’re a member of the “Containers” GitHub organization. If you can not set the label, just add a quick comment in the issue asking that the “In Progress” label be set and a member will do so for you. diff --git a/cmd/buildah/common.go b/cmd/buildah/common.go index c7004f2cc..069fa4372 100644 --- a/cmd/buildah/common.go +++ b/cmd/buildah/common.go @@ -449,7 +449,7 @@ func Tail(a []string) []string { } // UsageTemplate returns the usage template for podman commands -// This blocks the desplaying of the global options. The main podman +// This blocks the displaying of the global options. The main podman // command should not use this. func UsageTemplate() string { return `Usage:{{if .Runnable}} diff --git a/cmd/buildah/containers_test.go b/cmd/buildah/containers_test.go index 729509642..b4c2d1b6d 100644 --- a/cmd/buildah/containers_test.go +++ b/cmd/buildah/containers_test.go @@ -45,7 +45,7 @@ func TestContainerTemplateOutputInvalidFormat(t *testing.T) { } } -func TestContainerTemplateOutputInexistenceField(t *testing.T) { +func TestContainerTemplateOutputNonexistentField(t *testing.T) { params := containerOutputParams{ ContainerID: "e477836657bb", Builder: " ", @@ -58,7 +58,7 @@ func TestContainerTemplateOutputInexistenceField(t *testing.T) { err := containerOutputUsingTemplate(formatString, params) if err == nil || !strings.Contains(err.Error(), "can't evaluate field ID") { - t.Fatalf("expected error inexistence field") + t.Fatalf("expected error nonexistent field") } } diff --git a/cmd/buildah/images_test.go b/cmd/buildah/images_test.go index 69a469939..4d9de38ff 100644 --- a/cmd/buildah/images_test.go +++ b/cmd/buildah/images_test.go @@ -328,7 +328,7 @@ func TestParseFilterInvalidFilter(t *testing.T) { } } -func TestMatchesDangingTrue(t *testing.T) { +func TestMatchesDanglingTrue(t *testing.T) { if !matchesDangling("", "true") { t.Error("matchesDangling() should return true with dangling=true and name=") } @@ -338,7 +338,7 @@ func TestMatchesDangingTrue(t *testing.T) { } } -func TestMatchesDangingFalse(t *testing.T) { +func TestMatchesDanglingFalse(t *testing.T) { if matchesDangling("hello", "true") { t.Error("matchesDangling() should return false with dangling=true and name=hello") } @@ -411,7 +411,7 @@ func TestMatchesBeforeImageFalse(t *testing.T) { } } -func TestMatchesSinceeImageTrue(t *testing.T) { +func TestMatchesSinceImageTrue(t *testing.T) { // Make sure the tests are running as root failTestIfNotRoot(t) diff --git a/config.go b/config.go index 08beeb407..9bed6542f 100644 --- a/config.go +++ b/config.go @@ -529,7 +529,7 @@ func (b *Builder) SetHistoryComment(comment string) { } // StopSignal returns the signal which will be set in the container and in -// containers built using images buiilt from the container +// containers built using images built from the container func (b *Builder) StopSignal() string { return b.Docker.Config.StopSignal } diff --git a/contrib/buildahimage/stablebyhand/Containerfile.buildahstable b/contrib/buildahimage/stablebyhand/Containerfile.buildahstable index c931cfd59..ddeca1961 100644 --- a/contrib/buildahimage/stablebyhand/Containerfile.buildahstable +++ b/contrib/buildahimage/stablebyhand/Containerfile.buildahstable @@ -13,7 +13,7 @@ # FROM registry.fedoraproject.org/fedora:latest -# Build a version: Copy tar file from bohdi to `/root/tmp` then run +# Build a version: Copy tar file from bodhi to `/root/tmp` then run # `podman build -t quay.io/stable:v1.14.3 -f ~/Containerfile.buildahstable .` # Don't include container-selinux and remove directories diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 5322b9ade..c3e22226a 100755 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -242,7 +242,7 @@ in_podman() { [[ -z "$envname" ]] || [[ -z "$envvalue" ]] || \ envargs="${envargs:+$envargs }-e $envname=$envvalue" done - # Back in the days of testing under PAPR, containers were run with super-privledges. + # Back in the days of testing under PAPR, containers were run with super-privileges. # That behavior is preserved here with a few updates for modern podman behaviors. # The only other additions/changes are passthrough of CI-related env. vars ($envargs), # some path related updates, and mounting cgroups RW instead of the RO default. diff --git a/copier/copier.go b/copier/copier.go index ef0e4778d..f1aef4b29 100644 --- a/copier/copier.go +++ b/copier/copier.go @@ -364,7 +364,7 @@ func cleanerReldirectory(candidate string) string { return cleaned } -// convertToRelSubirectory returns the path of directory, bound and relative to +// convertToRelSubdirectory returns the path of directory, bound and relative to // root, as a relative path, or an error if that path can't be computed or if // the two directories are on different volumes func convertToRelSubdirectory(root, directory string) (relative string, err error) { diff --git a/demos/buildah_multi_stage.sh b/demos/buildah_multi_stage.sh index 413e570c6..ed6bdfafb 100755 --- a/demos/buildah_multi_stage.sh +++ b/demos/buildah_multi_stage.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # author : tsweeney (based on ipbabble's other demos) -# Based on Alex Ellis blog (https://blog.alexellis.io/mutli-stage-docker-builds) +# Based on Alex Ellis blog (https://blog.alexellis.io/multi-stage-docker-builds) # Assumptions install buildah and podman # Set some of the variables below demoimg=mymultidemo -quayuser=myquauuser +quayuser=myquayuser myname=MyName distrorelease=30 pkgmgr=dnf # switch to yum if using yum diff --git a/docs/buildah-add.md b/docs/buildah-add.md index bc61547a9..f8709ac32 100644 --- a/docs/buildah-add.md +++ b/docs/buildah-add.md @@ -65,7 +65,7 @@ When the \fB\fC\-\-ignorefile\fR option is specified Buildah reads the content to exclude files and directories from the source directory, when copying content into the image. -Users can specify a series of Unix shell globals in a inore file to +Users can specify a series of Unix shell globals in a ignore file to identify files/directories to exclude. Buildah supports a special wildcard string `**` which matches any number of diff --git a/docs/buildah-bud.md b/docs/buildah-bud.md index 93ce148ea..432236105 100644 --- a/docs/buildah-bud.md +++ b/docs/buildah-bud.md @@ -631,7 +631,7 @@ Only the current container can use a private volume. `Overlay Volume Mounts` - The `:O` flag tells Buildah to mount the directory from the host as a temporary storage using the Overlay file system. The `RUN` command containers are allowed to modify contents within the mountpoint and are stored in the container storage in a separate directory. In Ovelay FS terms the source directory will be the lower, and the container storage directory will be the upper. Modifications to the mount point are destroyed when the `RUN` command finishes executing, similar to a tmpfs mount point. + The `:O` flag tells Buildah to mount the directory from the host as a temporary storage using the Overlay file system. The `RUN` command containers are allowed to modify contents within the mountpoint and are stored in the container storage in a separate directory. In Overlay FS terms the source directory will be the lower, and the container storage directory will be the upper. Modifications to the mount point are destroyed when the `RUN` command finishes executing, similar to a tmpfs mount point. Any subsequent execution of `RUN` commands sees the original source directory content, any changes from previous RUN commands no longer exists. @@ -663,7 +663,7 @@ Use `df ` to determine the source mount and then use `findmnt -o TARGET,PROPAGATION ` to determine propagation properties of source mount, if `findmnt` utility is not available, the source mount point can be determined by looking at the mount entry in `/proc/self/mountinfo`. Look -at `optional fields` and see if any propagaion properties are specified. +at `optional fields` and see if any propagation properties are specified. `shared:X` means the mount is `shared`, `master:X` means the mount is `slave` and if nothing is there that means the mount is `private`. [[1]](#Footnote1) @@ -779,7 +779,7 @@ are stored while pulling and pushing images. Defaults to '/var/tmp'. ### `.dockerignore` If the file .dockerignore exists in the context directory, `buildah copy` reads -its contents. Use `--ignorefile` flag to overide .dockerignore path location. +its contents. Use `--ignorefile` flag to override .dockerignore path location. Buildah uses the content to exclude files and directories from the context directory, when executing COPY and ADD directives in the Containerfile/Dockerfile diff --git a/docs/buildah-copy.md b/docs/buildah-copy.md index a6a4484b9..81d509123 100644 --- a/docs/buildah-copy.md +++ b/docs/buildah-copy.md @@ -63,7 +63,7 @@ When the \fB\fC\-\-ignorefile\fR option is specified Buildah reads the content to exclude files and directories from the source directory, when copying content into the image. -Users can specify a series of Unix shell globals in a inore file to +Users can specify a series of Unix shell globals in a ignore file to identify files/directories to exclude. Buildah supports a special wildcard string `**` which matches any number of diff --git a/docs/buildah-from.md b/docs/buildah-from.md index 65f23113d..ffa15b1b1 100644 --- a/docs/buildah-from.md +++ b/docs/buildah-from.md @@ -491,7 +491,7 @@ Only the current container can use a private volume. `Overlay Volume Mounts` - The `:O` flag tells Buildah to mount the directory from the host as a temporary storage using the Overlay file system. The `RUN` command containers are allowed to modify contents within the mountpoint and are stored in the container storage in a separate directory. In Ovelay FS terms the source directory will be the lower, and the container storage directory will be the upper. Modifications to the mount point are destroyed when the `RUN` command finishes executing, similar to a tmpfs mount point. + The `:O` flag tells Buildah to mount the directory from the host as a temporary storage using the Overlay file system. The `RUN` command containers are allowed to modify contents within the mountpoint and are stored in the container storage in a separate directory. In Overlay FS terms the source directory will be the lower, and the container storage directory will be the upper. Modifications to the mount point are destroyed when the `RUN` command finishes executing, similar to a tmpfs mount point. Any subsequent execution of `RUN` commands sees the original source directory content, any changes from previous RUN commands no longer exists. @@ -523,7 +523,7 @@ Use `df ` to determine the source mount and then use `findmnt -o TARGET,PROPAGATION ` to determine propagation properties of source mount, if `findmnt` utility is not available, the source mount point can be determined by looking at the mount entry in `/proc/self/mountinfo`. Look -at `optional fields` and see if any propagaion properties are specified. +at `optional fields` and see if any propagation properties are specified. `shared:X` means the mount is `shared`, `master:X` means the mount is `slave` and if nothing is there that means the mount is `private`. [[1]](#Footnote1) diff --git a/docs/buildah-logout.md b/docs/buildah-logout.md index 5df726888..e8e8a12d6 100644 --- a/docs/buildah-logout.md +++ b/docs/buildah-logout.md @@ -14,7 +14,7 @@ All the cached credentials can be removed by setting the **all** flag. **buildah [GLOBAL OPTIONS]** -**bildah logout [GLOBAL OPTIONS]** +**buildah logout [GLOBAL OPTIONS]** **buildah logout [OPTIONS] REGISTRY [GLOBAL OPTIONS]** @@ -43,7 +43,7 @@ Removed login credentials for docker.io ``` ``` -$ bildah logout --authfile authdir/myauths.json docker.io +$ buildah logout --authfile authdir/myauths.json docker.io Removed login credentials for docker.io ``` diff --git a/docs/buildah-run.md b/docs/buildah-run.md index ddb62c27b..5eb5a698b 100644 --- a/docs/buildah-run.md +++ b/docs/buildah-run.md @@ -248,7 +248,7 @@ Use `df ` to determine the source mount and then use `findmnt -o TARGET,PROPAGATION ` to determine propagation properties of source mount, if `findmnt` utility is not available, the source mount point can be determined by looking at the mount entry in `/proc/self/mountinfo`. Look -at `optional fields` and see if any propagaion properties are specified. +at `optional fields` and see if any propagation properties are specified. `shared:X` means the mount is `shared`, `master:X` means the mount is `slave` and if nothing is there that means the mount is `private`. [[1]](#Footnote1) diff --git a/docs/release-announcements/v0.12.md b/docs/release-announcements/v0.12.md index d21341a6a..0497e7189 100644 --- a/docs/release-announcements/v0.12.md +++ b/docs/release-announcements/v0.12.md @@ -13,7 +13,7 @@ The Buildah project has been building some steam over the past several weeks, we * Return exit code 1 when 'buildah rmi' fails. * Improve lookups of a variety of image name formats. * Adds the --format and --filter parameters to the 'buildah containers' command. -* Adds the --prune,-p option to the 'buidah rmi' command allowing dangling images to be pruned. +* Adds the --prune,-p option to the 'buildah rmi' command allowing dangling images to be pruned. * Adds the --authfile parameter to the 'buildah commit' command. * Fix the --runtime-flag for the 'buildah run' and 'buildah bud' commands when global flags are used. * The format parameter now overrides the quiet parameter for 'buildah images'. diff --git a/docs/tutorials/01-intro.md b/docs/tutorials/01-intro.md index 4c13534af..c2fb3edd0 100644 --- a/docs/tutorials/01-intro.md +++ b/docs/tutorials/01-intro.md @@ -276,4 +276,4 @@ Well done. You have learned a lot about Buildah using this short tutorial. Hopef If you have any suggestions or issues please post them at the [Buildah Issues page](https://github.com/containers/buildah/issues). -For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/containers/buildah). +For more information on Buildah and how you might contribute please visit the [Buildah home page on GitHub](https://github.com/containers/buildah). diff --git a/docs/tutorials/03-on-build.md b/docs/tutorials/03-on-build.md index f8b8125d7..3c1ba4998 100644 --- a/docs/tutorials/03-on-build.md +++ b/docs/tutorials/03-on-build.md @@ -185,7 +185,7 @@ Well done. You have learned about Buildah's ONBUILD functionality using this sho If you have any suggestions or issues please post them at the [Buildah Issues page](https://github.com/containers/buildah/issues). -For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/containers/buildah). +For more information on Buildah and how you might contribute please visit the [Buildah home page on GitHub](https://github.com/containers/buildah). [GitHub]: https://github.com/containers/podman/ [image specification]: https://github.com/opencontainers/runtime-spec diff --git a/docs/tutorials/05-openshift-rootless-bud.md b/docs/tutorials/05-openshift-rootless-bud.md index add6fcdca..3f380dccc 100644 --- a/docs/tutorials/05-openshift-rootless-bud.md +++ b/docs/tutorials/05-openshift-rootless-bud.md @@ -259,7 +259,7 @@ sh-5.0$ buildah info Now create some files for testing. -This container test file excersises at least some of the critical parts of building an image (package update/installation, execution of commands, and use of volumes). +This container test file exercises at least some of the critical parts of building an image (package update/installation, execution of commands, and use of volumes). ````console sh-5.0$ cat > test-script.sh <&2 diff --git a/tests/lists.bats b/tests/lists.bats index fb588e879..6903ae0cc 100644 --- a/tests/lists.bats +++ b/tests/lists.bats @@ -103,11 +103,11 @@ IMAGE_LIST_S390X_INSTANCE_DIGEST=sha256:882a20ee0df7399a445285361d38b711c299ca09 run_buildah 125 manifest inspect foo } -@test "manifest-push should fail with nonexist authfile" { +@test "manifest-push should fail with nonexistent authfile" { run_buildah manifest create foo run_buildah manifest add --override-arch=arm64 foo ${IMAGE_LIST} run_buildah manifest inspect foo - run_buildah 125 manifest push --authfile /tmp/nonexist --signature-policy ${TESTSDIR}/policy.json --purge foo dir:${TESTDIR}/pushed + run_buildah 125 manifest push --authfile /tmp/nonexistent --signature-policy ${TESTSDIR}/policy.json --purge foo dir:${TESTDIR}/pushed } diff --git a/tests/pull.bats b/tests/pull.bats index 275b4a92b..73217ec43 100644 --- a/tests/pull.bats +++ b/tests/pull.bats @@ -76,7 +76,7 @@ load helpers expect_output "Non-docker transport is not supported, for --all-tags pulling" } -@test "pull-from-docker-deamon" { +@test "pull-from-docker-daemon" { run systemctl status docker if [[ ! "$output" =~ "active (running)" ]] then @@ -164,8 +164,8 @@ load helpers expect_output --substring 'pull from registry at "docker.io" denied by policy: not in allowed registries list' } -@test "pull should fail with nonexist authfile" { - run_buildah 125 pull --authfile /tmp/nonexist --signature-policy ${TESTSDIR}/policy.json alpine +@test "pull should fail with nonexistent authfile" { + run_buildah 125 pull --authfile /tmp/nonexistent --signature-policy ${TESTSDIR}/policy.json alpine } @test "pull encrypted local image" { diff --git a/tests/push.bats b/tests/push.bats index e98056585..91ec4eb14 100644 --- a/tests/push.bats +++ b/tests/push.bats @@ -86,13 +86,13 @@ load helpers expect_output --substring "docker://busybox" } -@test "push should fail with nonexist authfile" { +@test "push should fail with nonexistent authfile" { _prefetch alpine run_buildah from --quiet --pull --signature-policy ${TESTSDIR}/policy.json alpine cid=$output run_buildah images -q imageid=$output - run_buildah 125 push --signature-policy ${TESTSDIR}/policy.json --authfile /tmp/nonexsit $imageid dir:${TESTDIR}/my-tmp-dir + run_buildah 125 push --signature-policy ${TESTSDIR}/policy.json --authfile /tmp/nonexistent $imageid dir:${TESTDIR}/my-tmp-dir } @test "push-denied-by-registry-sources" { diff --git a/tests/test_buildah_build_rpm.sh b/tests/test_buildah_build_rpm.sh index 4781400c2..79a271bcb 100755 --- a/tests/test_buildah_build_rpm.sh +++ b/tests/test_buildah_build_rpm.sh @@ -4,7 +4,7 @@ # # Meant to run on a freshly installed VM. # Installs the latest Git and Buildah and then -# Builds and installs Buildah's RPM in a Buidah Container. +# Builds and installs Buildah's RPM in a Buildah Container. # The baseline test is then run on this vm and then the # newly created BUILDAH rpm is installed and the baseline # test is rerun.