opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-01 18:49:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor: bump containers/(storage, common, buildah, image)

Browse Source 
Bump containers/(storage, common, buildah and image)

Changes since 2023-01-01:
 - skip mount-cache-selinux-long-name test under remote, with
   a FIXME requesting that someone see if it can be made to work.

 - skip six tests that fail under rootless-remote

 - add new --build-arg-file option:
 - update man page

Squash of:
* cf56eb1865
* 561f082772

Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Signed-off-by: Aditya R <arajan@redhat.com>
This commit is contained in:
Aditya R
2023-04-10 17:02:21 +05:30
parent c04ccdbc55
commit 260bc3ec4c
274 changed files with 19599 additions and 1689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
vendor/github.com/containers/buildah/new.go generated vendored
View File

@@ -286,15 +286,6 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
namespaceOptions := defaultNamespaceOptions
namespaceOptions.AddOrReplace(options.NamespaceOptions...)
// Set the base-image annotations as suggested by the OCI image spec.
imageAnnotations := map[string]string{}
imageAnnotations[v1.AnnotationBaseImageDigest] = imageDigest
if !shortnames.IsShortName(imageSpec) {
// If the base image could be resolved to a fully-qualified
// image name, let's set it.
imageAnnotations[v1.AnnotationBaseImageName] = imageSpec
}
builder := &Builder{
store: store,
Type: containerType,
@@ -304,7 +295,7 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
GroupAdd: options.GroupAdd,
Container: name,
ContainerID: container.ID,
ImageAnnotations: imageAnnotations,
ImageAnnotations: map[string]string{},
ImageCreatedBy: "",
ProcessLabel: container.ProcessLabel(),
MountLabel: container.MountLabel(),
@@ -341,6 +332,18 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
if err := builder.initConfig(ctx, src, systemContext); err != nil {
return nil, fmt.Errorf("preparing image configuration: %w", err)
}
if !options.PreserveBaseImageAnns {
builder.SetAnnotation(v1.AnnotationBaseImageDigest, imageDigest)
if !shortnames.IsShortName(imageSpec) {
// If the base image was specified as a fully-qualified
// image name, let's set it.
builder.SetAnnotation(v1.AnnotationBaseImageName, imageSpec)
} else {
builder.UnsetAnnotation(v1.AnnotationBaseImageName)
}
}
err = builder.Save()
if err != nil {
return nil, fmt.Errorf("saving builder state for container %q: %w", builder.ContainerID, err)