Skip to content

Commit a37c0f4

Browse files
committed
Replace copied code with manifest-tool library
Signed-off-by: Avi Deitcher <avi@deitcher.net>
1 parent a13ff6b commit a37c0f4

File tree

9 files changed

+317
-300
lines changed

9 files changed

+317
-300
lines changed

src/cmd/linuxkit/pkglib/docker.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616

1717
"github.com/docker/cli/cli/config"
1818
dockertypes "github.com/docker/docker/api/types"
19+
"github.com/estesp/manifest-tool/pkg/registry"
1920
"github.com/estesp/manifest-tool/pkg/types"
2021
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
2122
log "github.com/sirupsen/logrus"
@@ -247,7 +248,7 @@ func manifestPush(img string, auth dockertypes.AuthConfig) (hash string, length
247248
}
248249

249250
// push the manifest list with the auth as given, ignore missing, do not allow insecure
250-
return pushManifestList(auth, yamlInput, true, false, false, "")
251+
return registry.PushManifestList(auth.Username, auth.Password, yamlInput, true, false, false, "")
251252
}
252253

253254
func signManifest(img, digest string, length int, auth dockertypes.AuthConfig) error {

src/cmd/linuxkit/pkglib/manifest.go

Lines changed: 0 additions & 297 deletions
This file was deleted.

src/cmd/linuxkit/vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f
3131
github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18
3232
github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
3333
github.com/docker/libtrust aabc10ec26b754e797f9028f4589c5b7bd90dc20
34-
github.com/estesp/manifest-tool bae5531170d45955c2d72d1b29d77ce1b0c9dedb
34+
github.com/estesp/manifest-tool 2d360eeba276afaf63ab22270b7c6b4f8447e261
3535
github.com/fvbommel/sortorder 6b6b45a52fcc54f788363c1880630248b63402a1
3636
github.com/go-ini/ini afbc45e87f3ba324c532d12c71918ef52e0fb194
3737
github.com/gogo/protobuf v1.3.1

src/cmd/linuxkit/vendor/github.com/estesp/manifest-tool/go.mod

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/linuxkit/vendor/github.com/estesp/manifest-tool/pkg/registry/fetch.go

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

0 commit comments

Comments
 (0)