diff --git a/Makefile b/Makefile index 222715e7b8..69298ba520 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ containers-storage: $(sources) ## build using gc on the host $(GO) build $(MOD_VENDOR) -compiler gc $(BUILDFLAGS) ./cmd/containers-storage codespell: - codespell -S Makefile,build,buildah,buildah.spec,imgtype,copy,AUTHORS,bin,vendor,.git,go.sum,CHANGELOG.md,changelog.txt,seccomp.json,.cirrus.yml,"*.xz,*.gz,*.tar,*.tgz,*ico,*.png,*.1,*.5,*.orig,*.rej" -L flate,uint,iff,od,ERRO -w + codespell -S Makefile,build,buildah,buildah.spec,imgtype,copy,AUTHORS,bin,vendor,.git,go.sum,CHANGELOG.md,changelog.txt,seccomp.json,.cirrus.yml,"*.xz,*.gz,*.tar,*.tgz,*ico,*.png,*.1,*.5,*.orig,*.rej" -L worl,flate,uint,iff,od,ERRO -w binary local-binary: containers-storage diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index fba277869c..fc121d7e7d 100755 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -52,7 +52,7 @@ CIRRUS_REPO_NAME=${CIRRUS_REPO_NAME:-storage} # Cirrus only sets $CIRRUS_BASE_SHA properly for PRs, but $EPOCH_TEST_COMMIT # needs to be set from this value in order for `make validate` to run properly. # When running get_ci_vm.sh, most $CIRRUS_xyz variables are empty. Attempt -# to accomidate both branch and get_ci_vm.sh testing by discovering the base +# to accommodate both branch and get_ci_vm.sh testing by discovering the base # branch SHA value. if [[ -z "$CIRRUS_BASE_SHA" ]] && [[ -z "$CIRRUS_TAG" ]] then # Operating on a branch, or under `get_ci_vm.sh` diff --git a/docs/containers-storage-gc.md b/docs/containers-storage-gc.md index 54939e7810..81c51c599b 100644 --- a/docs/containers-storage-gc.md +++ b/docs/containers-storage-gc.md @@ -1,7 +1,7 @@ ## containers-storage-gc 1 "January 2023" ## NAME -containers-storage gc - Garbage collect leftovers from partial layers/images/contianers +containers-storage gc - Garbage collect leftovers from partial layers/images/containers ## SYNOPSIS **containers-storage** **gc** diff --git a/drivers/driver.go b/drivers/driver.go index b3b0614fd3..3d4a15ee39 100644 --- a/drivers/driver.go +++ b/drivers/driver.go @@ -223,7 +223,7 @@ type CapabilityDriver interface { Capabilities() Capabilities } -// AdditionalLayer reprents a layer that is stored in the additional layer store +// AdditionalLayer represents a layer that is stored in the additional layer store // This API is experimental and can be changed without bumping the major version number. type AdditionalLayer interface { // CreateAs creates a new layer from this additional layer diff --git a/layers.go b/layers.go index 2f06ce8090..3176062b9c 100644 --- a/layers.go +++ b/layers.go @@ -281,7 +281,7 @@ type rwLayerStore interface { // unmount unmounts a layer when it is no longer in use. // If conditional is set, it will fail with ErrLayerNotMounted if the layer is not mounted (without conditional, the caller is // making a promise that the layer is actually mounted). - // If force is set, it will physically try to unmount it even if it is mounted multple times, or even if (!conditional and) + // If force is set, it will physically try to unmount it even if it is mounted multiple times, or even if (!conditional and) // there are no records of it being mounted in the first place. // It returns whether the layer was still mounted at the time this function returned. // WARNING: The return value may already be obsolete by the time it is available diff --git a/pkg/regexp/regexp.go b/pkg/regexp/regexp.go index ec87971063..458b833787 100644 --- a/pkg/regexp/regexp.go +++ b/pkg/regexp/regexp.go @@ -7,7 +7,7 @@ import ( ) // Regexp is a wrapper struct used for wrapping MustCompile regex expressions -// used as global variables. Using this stucture helps speed the startup time +// used as global variables. Using this structure helps speed the startup time // of apps that want to use global regex variables. This library initializes them on // first use as opposed to the start of the executable. type Regexp struct { diff --git a/store.go b/store.go index c788c3f145..6e7a99314e 100644 --- a/store.go +++ b/store.go @@ -519,7 +519,7 @@ type Store interface { GarbageCollect() error } -// AdditionalLayer reprents a layer that is contained in the additional layer store +// AdditionalLayer represents a layer that is contained in the additional layer store // This API is experimental and can be changed without bumping the major version number. type AdditionalLayer interface { // PutAs creates layer based on this handler, using diff contents from the additional @@ -820,7 +820,7 @@ func (s *store) GIDMap() []idtools.IDMap { return copyIDMap(s.gidMap) } -// This must only be called when constructing store; it writes to fields that are assumed to be constant after constrution. +// This must only be called when constructing store; it writes to fields that are assumed to be constant after construction. func (s *store) load() error { var driver drivers.Driver if err := func() error { // A scope for defer diff --git a/types/options.go b/types/options.go index 01f4e5a797..34252dd630 100644 --- a/types/options.go +++ b/types/options.go @@ -186,7 +186,7 @@ func loadStoreOptions(rootless bool, rootlessUID int) (StoreOptions, error) { return defaultStoreOptionsIsolated(rootless, rootlessUID, storageConf) } -// UpdateOptions should be called iff container engine recieved a SIGHUP, +// UpdateOptions should be called iff container engine received a SIGHUP, // otherwise use DefaultStoreOptions func UpdateStoreOptions(rootless bool, rootlessUID int) (StoreOptions, error) { storeOptions, storeError = loadStoreOptions(rootless, rootlessUID)