diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eee4b816..8c59f31c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,7 +134,7 @@ When new PRs for [containers/image](https://github.com/containers/image) break ` - create out a new branch in your `skopeo` checkout and switch to it - update `vendor.conf`. Find out the `containers/image` dependency; update it to vendor from your own branch and your own repository fork (e.g. `github.com/containers/image my-branch https://github.com/runcom/image`) - run `make vendor` -- make any other necessary changes in the skopeo repo (e.g. add other dependencies now requied by `containers/image`, or update skopeo for changed `containers/image` API) +- make any other necessary changes in the skopeo repo (e.g. add other dependencies now required by `containers/image`, or update skopeo for changed `containers/image` API) - optionally add new integration tests to the skopeo repo - submit the resulting branch as a skopeo PR, marked “DO NOT MERGE” - iterate until tests pass and the PR is reviewed diff --git a/cmd/skopeo/inspect.go b/cmd/skopeo/inspect.go index 59df0a50..140f90f9 100644 --- a/cmd/skopeo/inspect.go +++ b/cmd/skopeo/inspect.go @@ -153,7 +153,7 @@ func (opts *inspectOptions) run(args []string, stdout io.Writer) (retErr error) Name: "", // Set below if DockerReference() is known Tag: imgInspect.Tag, // Digest is set below. - RepoTags: []string{}, // Possibly overriden for docker.Transport. + RepoTags: []string{}, // Possibly overridden for docker.Transport. Created: imgInspect.Created, DockerVersion: imgInspect.DockerVersion, Labels: imgInspect.Labels, diff --git a/cmd/skopeo/sync.go b/cmd/skopeo/sync.go index 93024c45..138ff9be 100644 --- a/cmd/skopeo/sync.go +++ b/cmd/skopeo/sync.go @@ -26,7 +26,7 @@ import ( // syncOptions contains information retrieved from the skopeo sync command line. type syncOptions struct { - global *globalOptions // Global (not command dependant) skopeo options + global *globalOptions // Global (not command dependent) skopeo options srcImage *imageOptions // Source image options destImage *imageDestOptions // Destination image options retryOpts *retry.RetryOptions diff --git a/cmd/skopeo/utils.go b/cmd/skopeo/utils.go index 5edb3b75..abe4fbd0 100644 --- a/cmd/skopeo/utils.go +++ b/cmd/skopeo/utils.go @@ -157,7 +157,7 @@ func (opts *imageOptions) newSystemContext() (*types.SystemContext, error) { return ctx, nil } -// imageDestOptions is a superset of imageOptions specialized for iamge destinations. +// imageDestOptions is a superset of imageOptions specialized for image destinations. type imageDestOptions struct { *imageOptions dirForceCompression bool // Compress layers when saving to the dir: transport diff --git a/docs/skopeo-copy.1.md b/docs/skopeo-copy.1.md index a422a024..1c38bcbf 100644 --- a/docs/skopeo-copy.1.md +++ b/docs/skopeo-copy.1.md @@ -52,7 +52,7 @@ Path of the authentication file for the destination registry. Uses path given by **--encryption-key** _protocol:keyfile_ specifies the encryption protocol, which can be JWE (RFC7516), PGP (RFC4880), and PKCS7 (RFC2315) and the key material required for image encryption. For instance, jwe:/path/to/key.pem or pgp:admin@example.com or pkcs7:/path/to/x509-file. -**--decryption-key** _key[:passphrase]_ to be used for decryption of images. Key can point to keys and/or certificates. Decryption will be tried with all keys. If the key is protected by a passphrase, it is required to be passed in the argument and ommitted otherwise. +**--decryption-key** _key[:passphrase]_ to be used for decryption of images. Key can point to keys and/or certificates. Decryption will be tried with all keys. If the key is protected by a passphrase, it is required to be passed in the argument and omitted otherwise. **--src-creds** _username[:password]_ for accessing the source registry diff --git a/integration/copy_test.go b/integration/copy_test.go index 612eafc5..3f8ba901 100644 --- a/integration/copy_test.go +++ b/integration/copy_test.go @@ -488,7 +488,7 @@ func (s *CopySuite) TestCopySimpleAtomicRegistry(c *check.C) { c.Assert(err, check.IsNil) defer os.RemoveAll(dir2) - // FIXME: It would be nice to use one of the local Docker registries instead of neeeding an Internet connection. + // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. // "pull": docker: → dir: assertSkopeoSucceeds(c, "", "copy", "docker://estesp/busybox:amd64", "dir:"+dir1) // "push": dir: → atomic: @@ -509,7 +509,7 @@ func (s *CopySuite) TestCopySimple(c *check.C) { c.Assert(err, check.IsNil) defer os.RemoveAll(dir2) - // FIXME: It would be nice to use one of the local Docker registries instead of neeeding an Internet connection. + // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. // "pull": docker: → dir: assertSkopeoSucceeds(c, "", "copy", "docker://busybox", "dir:"+dir1) // "push": dir: → docker(v2s2): @@ -626,7 +626,7 @@ func (s *CopySuite) TestCopyEncryption(c *check.C) { // Since the image is partially encrypted we should find layers that aren't encrypted matchLayerBlobBinaryType(c, partiallyEncryptedImgDir+"/blobs/sha256", "application/x-gzip", 2) - // Decrypt the partically encrypted image + // Decrypt the partially encrypted image assertSkopeoSucceeds(c, "", "copy", "--decryption-key", keysDir+"/private.key", "oci:"+partiallyEncryptedImgDir+":encrypted", "oci:"+partiallyDecryptedImgDir+":decrypted") @@ -720,7 +720,7 @@ func (s *CopySuite) TestCopyStreaming(c *check.C) { c.Assert(err, check.IsNil) defer os.RemoveAll(dir2) - // FIXME: It would be nice to use one of the local Docker registries instead of neeeding an Internet connection. + // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. // streaming: docker: → atomic: assertSkopeoSucceeds(c, "", "--tls-verify=false", "--debug", "copy", "docker://estesp/busybox:amd64", "atomic:localhost:5000/myns/unsigned:streaming") // Compare (copies of) the original and the copy: @@ -1087,7 +1087,7 @@ func (s *CopySuite) TestCopyVerifyingMirroredSignatures(c *check.C) { defer os.Remove(policy) // We use X-R-S-S for this testing to avoid having to deal with the sigstores. - // A downside is that OpenShift records signatures per image, so the error messsages below + // A downside is that OpenShift records signatures per image, so the error messages below // list all signatures for other tags used for the same image as well. // So, make sure to never create a signature that could be considered valid in a different part of the test (i.e. don't reuse tags). @@ -1103,7 +1103,7 @@ func (s *CopySuite) TestCopyVerifyingMirroredSignatures(c *check.C) { // Sign the image for the mirror assertSkopeoSucceeds(c, "", "--registries.d", registriesDir, "copy", "--src-tls-verify=false", "--dest-tls-verify=false", "--sign-by", "personal@example.com", regPrefix+"primary:unsigned", regPrefix+"mirror:mirror-signed") - // Verify that a correctly signed image for the mirror is acessible using the mirror's reference + // Verify that a correctly signed image for the mirror is accessible using the mirror's reference assertSkopeoSucceeds(c, "", "--policy", policy, "--registries.d", registriesDir, "--registries-conf", "fixtures/registries.conf", "copy", "--src-tls-verify=false", regPrefix+"mirror:mirror-signed", dirDest) // … but verify that while it is accessible using the primary location redirecting to the mirror, … assertSkopeoSucceeds(c, "" /* no --policy */, "--registries-conf", "fixtures/registries.conf", "copy", "--src-tls-verify=false", regPrefix+"primary:mirror-signed", dirDest) diff --git a/integration/sync_test.go b/integration/sync_test.go index 7e2bc130..43d9ada1 100644 --- a/integration/sync_test.go +++ b/integration/sync_test.go @@ -94,7 +94,7 @@ func (s *SyncSuite) TestDocker2DirTagged(c *check.C) { c.Assert(err, check.IsNil) defer os.RemoveAll(tmpDir) - // FIXME: It would be nice to use one of the local Docker registries instead of neeeding an Internet connection. + // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. image := "busybox:latest" imageRef, err := docker.ParseReference(fmt.Sprintf("//%s", image)) c.Assert(err, check.IsNil) @@ -118,7 +118,7 @@ func (s *SyncSuite) TestDocker2DirTagged(c *check.C) { } func (s *SyncSuite) TestScoped(c *check.C) { - // FIXME: It would be nice to use one of the local Docker registries instead of neeeding an Internet connection. + // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. image := "busybox:latest" imageRef, err := docker.ParseReference(fmt.Sprintf("//%s", image)) c.Assert(err, check.IsNil) @@ -138,7 +138,7 @@ func (s *SyncSuite) TestScoped(c *check.C) { } func (s *SyncSuite) TestDirIsNotOverwritten(c *check.C) { - // FIXME: It would be nice to use one of the local Docker registries instead of neeeding an Internet connection. + // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. image := "busybox:latest" imageRef, err := docker.ParseReference(fmt.Sprintf("//%s", image)) c.Assert(err, check.IsNil) @@ -173,7 +173,7 @@ func (s *SyncSuite) TestDocker2DirUntagged(c *check.C) { c.Assert(err, check.IsNil) defer os.RemoveAll(tmpDir) - // FIXME: It would be nice to use one of the local Docker registries instead of neeeding an Internet connection. + // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. image := "alpine" imageRef, err := docker.ParseReference(fmt.Sprintf("//%s", image)) c.Assert(err, check.IsNil) @@ -350,7 +350,7 @@ func (s *SyncSuite) TestYamlTLSVerify(c *check.C) { image := "busybox" tag := "latest" - // FIXME: It would be nice to use one of the local Docker registries instead of neeeding an Internet connection. + // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. // copy docker => docker assertSkopeoSucceeds(c, "", "copy", "--dest-tls-verify=false", "docker://"+image+":"+tag, localRegURL+image+":"+tag) @@ -403,7 +403,7 @@ func (s *SyncSuite) TestDocker2DockerTagged(c *check.C) { c.Assert(err, check.IsNil) defer os.RemoveAll(tmpDir) - // FIXME: It would be nice to use one of the local Docker registries instead of neeeding an Internet connection. + // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. image := "busybox:latest" imageRef, err := docker.ParseReference(fmt.Sprintf("//%s", image)) c.Assert(err, check.IsNil) @@ -436,7 +436,7 @@ func (s *SyncSuite) TestDir2DockerTagged(c *check.C) { c.Assert(err, check.IsNil) defer os.RemoveAll(tmpDir) - // FIXME: It would be nice to use one of the local Docker registries instead of neeeding an Internet connection. + // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. image := "busybox:latest" dir1 := path.Join(tmpDir, "dir1")