diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-03-31 12:59:08 -0500 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-04-01 14:10:57 -0500 |
| commit | 8500ce6b9ab0050b925ec3b899495cb2cc8d367f (patch) | |
| tree | 554448ea6140ef2a2814fe44b41b5da6f86b06f3 /libpod/image | |
| parent | d534e524272121a6489c1a2a2c11c6b389027ecd (diff) | |
| download | podman-8500ce6b9ab0050b925ec3b899495cb2cc8d367f.tar.gz podman-8500ce6b9ab0050b925ec3b899495cb2cc8d367f.tar.bz2 podman-8500ce6b9ab0050b925ec3b899495cb2cc8d367f.zip | |
podmanv2 load
enable podman load for v2
add reexec into main
add systemd build flag to v2 makefile
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'libpod/image')
| -rw-r--r-- | libpod/image/image.go | 6 | ||||
| -rw-r--r-- | libpod/image/image_test.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index 5f914ed79..80cc6f15a 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -512,8 +512,8 @@ func getImageDigest(ctx context.Context, src types.ImageReference, sc *types.Sys return "@" + imageDigest.Hex(), nil } -// normalizedTag returns the canonical version of tag for use in Image.Names() -func normalizedTag(tag string) (reference.Named, error) { +// NormalizedTag returns the canonical version of tag for use in Image.Names() +func NormalizedTag(tag string) (reference.Named, error) { decomposedTag, err := decompose(tag) if err != nil { return nil, err @@ -541,7 +541,7 @@ func (i *Image) TagImage(tag string) error { if err := i.reloadImage(); err != nil { return err } - ref, err := normalizedTag(tag) + ref, err := NormalizedTag(tag) if err != nil { return err } diff --git a/libpod/image/image_test.go b/libpod/image/image_test.go index 19f7eee1e..3cd368cdc 100644 --- a/libpod/image/image_test.go +++ b/libpod/image/image_test.go @@ -292,7 +292,7 @@ func TestNormalizedTag(t *testing.T) { {"ns/busybox:latest", "localhost/ns/busybox:latest"}, // Unqualified with a dot-less namespace {"docker.io/busybox:latest", "docker.io/library/busybox:latest"}, // docker.io without /library/ } { - res, err := normalizedTag(c.input) + res, err := NormalizedTag(c.input) if c.expected == "" { assert.Error(t, err, c.input) } else { |