containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14460 from cipherboy/align-docker-podman-load-output 

Align docker load and podman load output
This commit is contained in:
OpenShift Merge Robot 2022-06-02 21:24:26 -04:00 committed by GitHub
parent 38720d91af 1b6505d74b
commit 5e15a26e0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/images/load.go
View File

@ -110,6 +110,6 @@ func load(cmd *cobra.Command, args []string) error {
if err != nil { if err != nil {
return err return err
} }
fmt.Println("Loaded image(s): " + strings.Join(response.Names, ",")) fmt.Println("Loaded image: " + strings.Join(response.Names, "\nLoaded image: "))
return nil return nil
} }

12
docs/source/markdown/podman-image-scp.1.md
View File

@ -33,7 +33,7 @@ Suppress the output
``` ```
$ podman image scp alpine $ podman image scp alpine
Loaded image(s): docker.io/library/alpine:latest Loaded image: docker.io/library/alpine:latest
``` ```
``` ```
@ -43,12 +43,12 @@ Copying blob 72e830a4dff5 done
Copying config 85f9dc67c7 done Copying config 85f9dc67c7 done
Writing manifest to image destination Writing manifest to image destination
Storing signatures Storing signatures
Loaded image(s): docker.io/library/alpine:latest Loaded image: docker.io/library/alpine:latest
``` ```
``` ```
$ podman image scp Fedora::alpine RHEL:: $ podman image scp Fedora::alpine RHEL::
Loaded image(s): docker.io/library/alpine:latest Loaded image: docker.io/library/alpine:latest
``` ```
``` ```
@ -59,7 +59,7 @@ Copying blob 9450ef9feb15 [--------------------------------------] 0.0b / 0.0b
Copying config 1f97f0559c done Copying config 1f97f0559c done
Writing manifest to image destination Writing manifest to image destination
Storing signatures Storing signatures
Loaded image(s): docker.io/library/alpine:latest Loaded image: docker.io/library/alpine:latest
``` ```
``` ```
@ -73,7 +73,7 @@ Copying blob 5eb901baf107 skipped: already exists
Copying config 696d33ca15 done Copying config 696d33ca15 done
Writing manifest to image destination Writing manifest to image destination
Storing signatures Storing signatures
Loaded image(s): docker.io/library/alpine:latest Loaded image: docker.io/library/alpine:latest
``` ```
``` ```
@ -87,7 +87,7 @@ Copying blob 5eb901baf107
Copying config 696d33ca15 done Copying config 696d33ca15 done
Writing manifest to image destination Writing manifest to image destination
Storing signatures Storing signatures
Loaded image(s): docker.io/library/alpine:latest Loaded image: docker.io/library/alpine:latest
``` ```
## SEE ALSO ## SEE ALSO

2
test/system/120-load.bats
View File

@ -121,7 +121,7 @@ verify_iid_and_name() {
run_podman untag $IMAGE $newname run_podman untag $IMAGE $newname
run_podman image scp -q ${notme}@localhost::$newname run_podman image scp -q ${notme}@localhost::$newname
expect="Loaded image(s): $newname" expect="Loaded image: $newname"
is "$output" "$expect" "-q silences output" is "$output" "$expect" "-q silences output"
# Confirm that we have it, and that its digest matches our original # Confirm that we have it, and that its digest matches our original