mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-09-13 11:07:50 +00:00
d32863bbb4
The initial version of libimage changed the order of layers which has now been restored to remain backwards compatible. Further changes: * Fix a bug in the journald logging which requires to strip trailing new lines from the message. The system tests did not pass due to empty new lines. Triggered by changing the default logger to journald in containers/common. * Fix another bug in the journald logging which embedded the container ID inside the message rather than the specifid field. That surfaced in a preceeding whitespace of each log line which broke the system tests. * Alter the system tests to make sure that the k8s-file and the journald logging drivers are executed. * A number of e2e tests have been changed to force the k8s-file driver to make them pass when running inside a root container. * Increase the timeout in a kill test which seems to take longer now. Reasons are unknown. Tests passed earlier and no signal-related changes happend. It may be CI VM flake since some system tests but other flaked. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
88 lines
2.6 KiB
Go
88 lines
2.6 KiB
Go
package libimage
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
dockerArchiveTransport "github.com/containers/image/v5/docker/archive"
|
|
"github.com/containers/image/v5/docker/reference"
|
|
"github.com/containers/image/v5/transports/alltransports"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// PushOptions allows for custommizing image pushes.
|
|
type PushOptions struct {
|
|
CopyOptions
|
|
}
|
|
|
|
// Push pushes the specified source which must refer to an image in the local
|
|
// containers storage. It may or may not have the `containers-storage:`
|
|
// prefix. Use destination to push to a custom destination. The destination
|
|
// can refer to any supported transport. If not transport is specified, the
|
|
// docker transport (i.e., a registry) is implied. If destination is left
|
|
// empty, the docker destination will be extrapolated from the source.
|
|
//
|
|
// Return storage.ErrImageUnknown if source could not be found in the local
|
|
// containers storage.
|
|
func (r *Runtime) Push(ctx context.Context, source, destination string, options *PushOptions) ([]byte, error) {
|
|
if options == nil {
|
|
options = &PushOptions{}
|
|
}
|
|
|
|
// Look up the local image.
|
|
image, resolvedSource, err := r.LookupImage(source, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
srcRef, err := image.StorageReference()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Make sure we have a proper destination, and parse it into an image
|
|
// reference for copying.
|
|
if destination == "" {
|
|
// Doing an ID check here is tempting but false positives (due
|
|
// to a short partial IDs) are more painful than false
|
|
// negatives.
|
|
destination = resolvedSource
|
|
}
|
|
|
|
logrus.Debugf("Pushing image %s to %s", source, destination)
|
|
|
|
destRef, err := alltransports.ParseImageName(destination)
|
|
if err != nil {
|
|
// If the input does not include a transport assume it refers
|
|
// to a registry.
|
|
dockerRef, dockerErr := alltransports.ParseImageName("docker://" + destination)
|
|
if dockerErr != nil {
|
|
return nil, err
|
|
}
|
|
destRef = dockerRef
|
|
}
|
|
|
|
if r.eventChannel != nil {
|
|
r.writeEvent(&Event{ID: image.ID(), Name: destination, Time: time.Now(), Type: EventTypeImagePush})
|
|
}
|
|
|
|
// Buildah compat: Make sure to tag the destination image if it's a
|
|
// Docker archive. This way, we preserve the image name.
|
|
if destRef.Transport().Name() == dockerArchiveTransport.Transport.Name() {
|
|
if named, err := reference.ParseNamed(resolvedSource); err == nil {
|
|
tagged, isTagged := named.(reference.NamedTagged)
|
|
if isTagged {
|
|
options.dockerArchiveAdditionalTags = []reference.NamedTagged{tagged}
|
|
}
|
|
}
|
|
}
|
|
|
|
c, err := r.newCopier(&options.CopyOptions)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
defer c.close()
|
|
|
|
return c.copy(ctx, srcRef, destRef)
|
|
}
|