Skip to content

Update go-containerregistry #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2018
Merged

Update go-containerregistry #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@

[[constraint]]
name = "github.com/google/go-containerregistry"
revision = "7da7957aee21f95e68545e1ae235654daec23c89"
revision = "dc0a77702ddab8c3dc5630eca7c026d571c1c9b7"

16 changes: 6 additions & 10 deletions pkg/skaffold/docker/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ import (
"io"
"net/http"

"github.com/google/go-containerregistry/authn"
"github.com/google/go-containerregistry/name"
"github.com/google/go-containerregistry/v1"
"github.com/google/go-containerregistry/v1/remote"
"github.com/google/go-containerregistry/v1/remote/transport"

"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/pkg/progress"
"github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/name"
"github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/remote"
"github.com/google/go-containerregistry/pkg/v1/remote/transport"
"github.com/moby/moby/pkg/jsonmessage"
"github.com/moby/moby/pkg/streamformatter"
"github.com/moby/moby/pkg/term"
Expand Down Expand Up @@ -133,10 +132,7 @@ func addTag(ref name.Reference, targetRef name.Reference, auth authn.Authenticat
return err
}

wo := remote.WriteOptions{
MountPaths: []name.Repository{ref.Context()},
}
return remote.Write(targetRef, img, auth, t, wo)
return remote.Write(targetRef, img, auth, t, remote.WriteOptions{})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want to keep MountOptions if we can.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MountPaths field was removed. I don't know if something else needs to be done. @jonjohnsonjr @mattmoor ?

Copy link
Contributor

@jonjohnsonjr jonjohnsonjr Jun 8, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The happy path for mounting is now handled by the library, see google/go-containerregistry#186

tl;dr: remote layer reads retain the source repo and we specialize that case on remote layer writes to mount from where it was read, so you shouldn't need to do anything now :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, nice. Missed that change in the library somehow.

}

// Digest returns the image digest for a corresponding reference.
Expand Down
3 changes: 1 addition & 2 deletions pkg/skaffold/docker/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ import (
"strings"
"sync"

"github.com/google/go-containerregistry/v1"

"github.com/docker/docker/builder/dockerignore"
"github.com/docker/docker/pkg/fileutils"
"github.com/google/go-containerregistry/pkg/v1"
"github.com/moby/moby/builder/dockerfile/parser"
"github.com/moby/moby/builder/dockerfile/shell"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/docker/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"testing"

"github.com/GoogleContainerTools/skaffold/testutil"
"github.com/google/go-containerregistry/v1"
"github.com/google/go-containerregistry/pkg/v1"
)

const copyServerGo = `
Expand Down
0 ...google/go-containerregistry/authn/anon.go → ...le/go-containerregistry/pkg/authn/anon.go
View file
Open in desktop
File renamed without changes.
0 ...google/go-containerregistry/authn/auth.go → ...le/go-containerregistry/pkg/authn/auth.go
View file
Open in desktop
File renamed without changes.
0 ...oogle/go-containerregistry/authn/authn.go → ...e/go-containerregistry/pkg/authn/authn.go
View file
Open in desktop
File renamed without changes.
0 ...oogle/go-containerregistry/authn/basic.go → ...e/go-containerregistry/pkg/authn/basic.go
View file
Open in desktop
File renamed without changes.
0 ...ogle/go-containerregistry/authn/bearer.go → .../go-containerregistry/pkg/authn/bearer.go
View file
Open in desktop
File renamed without changes.
0 .../google/go-containerregistry/authn/doc.go → ...gle/go-containerregistry/pkg/authn/doc.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ogle/go-containerregistry/authn/helper.go → .../go-containerregistry/pkg/authn/helper.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...le/go-containerregistry/authn/keychain.go → ...o-containerregistry/pkg/authn/keychain.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...google/go-containerregistry/name/check.go → ...le/go-containerregistry/pkg/name/check.go
View file
Open in desktop
File renamed without changes.
0 ...oogle/go-containerregistry/name/digest.go → ...e/go-containerregistry/pkg/name/digest.go
View file
Open in desktop
File renamed without changes.
0 ...oogle/go-containerregistry/name/errors.go → ...e/go-containerregistry/pkg/name/errors.go
View file
Open in desktop
File renamed without changes.
0 ...m/google/go-containerregistry/name/ref.go → ...ogle/go-containerregistry/pkg/name/ref.go
View file
Open in desktop
File renamed without changes.
0 ...gle/go-containerregistry/name/registry.go → ...go-containerregistry/pkg/name/registry.go
View file
Open in desktop
File renamed without changes.
0 ...e/go-containerregistry/name/repository.go → ...-containerregistry/pkg/name/repository.go
View file
Open in desktop
File renamed without changes.
0 ...m/google/go-containerregistry/name/tag.go → ...ogle/go-containerregistry/pkg/name/tag.go
View file
Open in desktop
File renamed without changes.
0 .../google/go-containerregistry/v1/config.go → ...gle/go-containerregistry/pkg/v1/config.go
View file
Open in desktop
File renamed without changes.
0 ...com/google/go-containerregistry/v1/doc.go → ...google/go-containerregistry/pkg/v1/doc.go
View file
Open in desktop
File renamed without changes.
0 ...om/google/go-containerregistry/v1/hash.go → ...oogle/go-containerregistry/pkg/v1/hash.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...m/google/go-containerregistry/v1/image.go → ...ogle/go-containerregistry/pkg/v1/image.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...m/google/go-containerregistry/v1/layer.go → ...ogle/go-containerregistry/pkg/v1/layer.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...oogle/go-containerregistry/v1/manifest.go → ...e/go-containerregistry/pkg/v1/manifest.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions ...ontainerregistry/v1/partial/compressed.go → ...inerregistry/pkg/v1/partial/compressed.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...le/go-containerregistry/v1/partial/doc.go → ...o-containerregistry/pkg/v1/partial/doc.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../go-containerregistry/v1/partial/image.go → ...containerregistry/pkg/v1/partial/image.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...tainerregistry/v1/partial/uncompressed.go → ...erregistry/pkg/v1/partial/uncompressed.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions ...e/go-containerregistry/v1/partial/with.go → ...-containerregistry/pkg/v1/partial/with.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .../go-containerregistry/v1/remote/delete.go → ...containerregistry/pkg/v1/remote/delete.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...gle/go-containerregistry/v1/remote/doc.go → ...go-containerregistry/pkg/v1/remote/doc.go
View file
Open in desktop
File renamed without changes.
0 ...e/go-containerregistry/v1/remote/error.go → ...-containerregistry/pkg/v1/remote/error.go
View file
Open in desktop
File renamed without changes.
36 changes: 28 additions & 8 deletions ...e/go-containerregistry/v1/remote/image.go → ...-containerregistry/pkg/v1/remote/image.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...le/go-containerregistry/v1/remote/list.go → ...o-containerregistry/pkg/v1/remote/list.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 77 additions & 0 deletions vendor/github.com/google/go-containerregistry/pkg/v1/remote/mount.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...inerregistry/v1/remote/transport/basic.go → ...registry/pkg/v1/remote/transport/basic.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...nerregistry/v1/remote/transport/bearer.go → ...egistry/pkg/v1/remote/transport/bearer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...tainerregistry/v1/remote/transport/doc.go → ...erregistry/pkg/v1/remote/transport/doc.go
View file
Open in desktop
File renamed without changes.
Loading