github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3877 from giggsoff/propagate-manifest-option

Browse Source 
Propagate manifest option into push
This commit is contained in:
Avi Deitcher 2022-11-16 19:35:46 +02:00 committed by GitHub
commit a9c7a126cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmd/linuxkit/cache/push.go vendored
View File

@ -13,7 +13,7 @@ import (
) )
// Push push an image along with a multi-arch index. // Push push an image along with a multi-arch index.
func (p *Provider) Push(name string) error { func (p *Provider) Push(name string, withManifest bool) error {
var ( var (
err error err error
options []remote.Option options []remote.Option
@ -113,6 +113,9 @@ func (p *Provider) Push(name string) error {
return fmt.Errorf("name %s unknown in cache", name) return fmt.Errorf("name %s unknown in cache", name)
} }
if !withManifest {
return nil
}
// Even though we may have pushed the index, we want to be sure that we have an index that includes every architecture on the registry, // Even though we may have pushed the index, we want to be sure that we have an index that includes every architecture on the registry,
// not just those that were in our local cache. So we use manifest-tool library to build a broad index // not just those that were in our local cache. So we use manifest-tool library to build a broad index
auth, err := registry.GetDockerAuth() auth, err := registry.GetDockerAuth()

4
src/cmd/linuxkit/pkglib/build.go
View File

@ -419,7 +419,7 @@ func (p Pkg) Build(bos ...BuildOpt) error {
} }
// push the manifest // push the manifest
if err := c.Push(p.FullTag()); err != nil { if err := c.Push(p.FullTag(), bo.manifest); err != nil {
return err return err
} }
@ -441,7 +441,7 @@ func (p Pkg) Build(bos ...BuildOpt) error {
if _, err := c.DescriptorWrite(&ref, *desc); err != nil { if _, err := c.DescriptorWrite(&ref, *desc); err != nil {
return err return err
} }
if err := c.Push(fullRelTag); err != nil { if err := c.Push(fullRelTag, bo.manifest); err != nil {
return err return err
} }

2
src/cmd/linuxkit/pkglib/build_test.go
View File

@ -219,7 +219,7 @@ func (c *cacheMocker) IndexWrite(ref *reference.Spec, descriptors ...registry.De
return c.NewSource(ref, "", &desc), nil return c.NewSource(ref, "", &desc), nil
} }
func (c *cacheMocker) Push(name string) error { func (c *cacheMocker) Push(name string, withManifest bool) error {
if !c.enablePush { if !c.enablePush {
return errors.New("push disabled") return errors.New("push disabled")
} }

5
src/cmd/linuxkit/spec/cache.go
View File

@ -37,8 +37,9 @@ type CacheProvider interface {
// DescriptorWrite writes a descriptor to the cache index; it validates that it has a name // DescriptorWrite writes a descriptor to the cache index; it validates that it has a name
// and replaces any existing one // and replaces any existing one
DescriptorWrite(ref *reference.Spec, descriptors v1.Descriptor) (ImageSource, error) DescriptorWrite(ref *reference.Spec, descriptors v1.Descriptor) (ImageSource, error)
// Push push an image along with a multi-arch index from local cache to remote registry. // Push an image along with a multi-arch index from local cache to remote registry.
Push(name string) error // if withManifest defined will push a multi-arch manifest
Push(name string, withManifest bool) error
// NewSource return an ImageSource for a specific ref and architecture in the cache. // NewSource return an ImageSource for a specific ref and architecture in the cache.
NewSource(ref *reference.Spec, architecture string, descriptor *v1.Descriptor) ImageSource NewSource(ref *reference.Spec, architecture string, descriptor *v1.Descriptor) ImageSource
// Store get content.Store referencing the cache // Store get content.Store referencing the cache