Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Commit 43489e1

Browse files
dlorencdlorenc
authored
Update containers/images. (#179)
1 parent ea27f9c commit 43489e1

File tree

242 files changed

+3091
-20183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+3091
-20183
lines changed

‎BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
33

44
gazelle(
55
name = "gazelle",
6+
external = "vendored",
67
prefix = "github.com/GoogleCloudPlatform/container-diff",
78
)
89

‎Gopkg.lock

Lines changed: 5 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
[[constraint]]
4444
name = "github.com/containers/image"
45-
revision = "abb4cd79e3427bb2b02a5930814ef2ad19983c24"
45+
revision = "495da41bd26c50be62fa07ae903ea2ee54c00283"
4646

4747
[[constraint]]
4848
branch = "master"

‎cmd/BUILD.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ go_library(
1616
"//pkg/cache:go_default_library",
1717
"//pkg/util:go_default_library",
1818
"//util:go_default_library",
19+
"//vendor/github.com/containers/image/docker:go_default_library",
20+
"//vendor/github.com/docker/docker/client:go_default_library",
21+
"//vendor/github.com/mitchellh/go-homedir:go_default_library",
22+
"//vendor/github.com/sirupsen/logrus:go_default_library",
23+
"//vendor/github.com/spf13/cobra:go_default_library",
24+
"//vendor/github.com/spf13/pflag:go_default_library",
1925
"//version:go_default_library",
20-
"@com_github_containers_image//docker:go_default_library",
21-
"@com_github_docker_docker//client:go_default_library",
22-
"@com_github_mitchellh_go_homedir//:go_default_library",
23-
"@com_github_sirupsen_logrus//:go_default_library",
24-
"@com_github_spf13_cobra//:go_default_library",
25-
"@com_github_spf13_pflag//:go_default_library",
2626
],
2727
)
2828

‎cmd/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func getPrepperForImage(image string) (pkgutil.Prepper, error) {
139139
if err != nil {
140140
return nil, err
141141
}
142-
src, err := ref.NewImageSource(nil, nil)
142+
src, err := ref.NewImageSource(nil)
143143
if err != nil {
144144
return nil, err
145145
}

‎cmd/util/output/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ go_library(
55
srcs = ["output.go"],
66
importpath = "github.com/GoogleCloudPlatform/container-diff/cmd/util/output",
77
visibility = ["//visibility:public"],
8-
deps = ["@com_github_spf13_cobra//:go_default_library"],
8+
deps = ["//vendor/github.com/spf13/cobra:go_default_library"],
99
)

‎differs/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ go_library(
1717
deps = [
1818
"//pkg/util:go_default_library",
1919
"//util:go_default_library",
20-
"@com_github_containers_image//docker/tarfile:go_default_library",
21-
"@com_github_fsouza_go_dockerclient//:go_default_library",
22-
"@com_github_nightlyone_lockfile//:go_default_library",
23-
"@com_github_sirupsen_logrus//:go_default_library",
20+
"//vendor/github.com/containers/image/docker/tarfile:go_default_library",
21+
"//vendor/github.com/fsouza/go-dockerclient:go_default_library",
22+
"//vendor/github.com/nightlyone/lockfile:go_default_library",
23+
"//vendor/github.com/sirupsen/logrus:go_default_library",
2424
],
2525
)
2626

‎pkg/cache/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ go_library(
66
importpath = "github.com/GoogleCloudPlatform/container-diff/pkg/cache",
77
visibility = ["//visibility:public"],
88
deps = [
9-
"@com_github_containers_image//types:go_default_library",
10-
"@com_github_opencontainers_go_digest//:go_default_library",
11-
"@com_github_sirupsen_logrus//:go_default_library",
9+
"//vendor/github.com/containers/image/types:go_default_library",
10+
"//vendor/github.com/opencontainers/go-digest:go_default_library",
11+
"//vendor/github.com/sirupsen/logrus:go_default_library",
1212
],
1313
)

‎pkg/cache/file_cache.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ func (c *FileCache) Close() error {
8585
return nil
8686
}
8787

88-
func (c *FileCache) GetManifest() ([]byte, string, error) {
89-
return c.src.GetManifest()
88+
func (c *FileCache) GetManifest(d *digest.Digest) ([]byte, string, error) {
89+
return c.src.GetManifest(d)
9090
}
9191

9292
func (c *FileCache) GetTargetManifest(digest digest.Digest) ([]byte, string, error) {
@@ -113,6 +113,10 @@ func (c *FileCache) GetBlob(bi types.BlobInfo) (io.ReadCloser, int64, error) {
113113
}
114114

115115
// GetSignatures returns the image's signatures. It may use a remote (= slow) service.
116-
func (c *FileCache) GetSignatures(ctx context.Context) ([][]byte, error) {
117-
return c.src.GetSignatures(ctx)
116+
func (c *FileCache) GetSignatures(ctx context.Context, d *digest.Digest) ([][]byte, error) {
117+
return c.src.GetSignatures(ctx, d)
118+
}
119+
120+
func (c *FileCache) LayerInfosForCopy() []types.BlobInfo {
121+
return nil
118122
}

‎pkg/util/BUILD.bazel

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ go_library(
1616
visibility = ["//visibility:public"],
1717
deps = [
1818
"//cmd/util/output:go_default_library",
19-
"@com_github_containers_image//docker:go_default_library",
20-
"@com_github_containers_image//docker/daemon:go_default_library",
21-
"@com_github_containers_image//docker/tarfile:go_default_library",
22-
"@com_github_containers_image//manifest:go_default_library",
23-
"@com_github_containers_image//pkg/compression:go_default_library",
24-
"@com_github_containers_image//types:go_default_library",
25-
"@com_github_docker_docker//client:go_default_library",
26-
"@com_github_docker_docker//pkg/system:go_default_library",
27-
"@com_github_sirupsen_logrus//:go_default_library",
19+
"//vendor/github.com/containers/image/docker:go_default_library",
20+
"//vendor/github.com/containers/image/docker/daemon:go_default_library",
21+
"//vendor/github.com/containers/image/docker/tarfile:go_default_library",
22+
"//vendor/github.com/containers/image/manifest:go_default_library",
23+
"//vendor/github.com/containers/image/pkg/compression:go_default_library",
24+
"//vendor/github.com/containers/image/types:go_default_library",
25+
"//vendor/github.com/docker/docker/client:go_default_library",
26+
"//vendor/github.com/docker/docker/pkg/system:go_default_library",
27+
"//vendor/github.com/sirupsen/logrus:go_default_library",
2828
],
2929
)

0 commit comments

Comments
 (0)