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

Shortname deletion continued

Browse Source 
With certain short name usages, rmi still was unable to delete
certain images. This was also reflected in several commit tests
that were temporarily disabled.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #200
Approved by: rhatdan
This commit is contained in:
baude
2018-01-08 12:57:37 -06:00
committed by Atomic Bot
parent 3d05f100f7
commit c246b9d24f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/runtime_img.go
View File

@ -347,6 +347,7 @@ func getTags(nameInput string) (reference.NamedTagged, bool, error) {
func (k *Image) GetLocalImageName() (string, error) { func (k *Image) GetLocalImageName() (string, error) {
_, err := k.runtime.GetImage(k.Name) _, err := k.runtime.GetImage(k.Name)
if err == nil { if err == nil {
k.LocalName = k.Name
return k.Name, nil return k.Name, nil
} }
localImages, err := k.runtime.GetImages(&ImageFilterParams{}) localImages, err := k.runtime.GetImages(&ImageFilterParams{})
@ -359,6 +360,7 @@ func (k *Image) GetLocalImageName() (string, error) {
} }
for _, image := range localImages { for _, image := range localImages {
if strings.HasPrefix(image.ID, k.Name) { if strings.HasPrefix(image.ID, k.Name) {
k.ID = image.ID
return image.ID, nil return image.ID, nil
} }
for _, name := range image.Names { for _, name := range image.Names {
@ -379,11 +381,13 @@ func (k *Image) GetLocalImageName() (string, error) {
} }
if imageName == k.Name { if imageName == k.Name {
k.LocalName = name
return name, nil return name, nil
} }
imageSplit := strings.Split(imageName, "/") imageSplit := strings.Split(imageName, "/")
baseName := imageSplit[len(imageSplit)-1] baseName := imageSplit[len(imageSplit)-1]
if baseName == k.Name { if baseName == k.Name {
k.LocalName = name
return name, nil return name, nil
} }
} }

6
test/podman_commit.bats
View File

@ -13,7 +13,6 @@ function setup() {
} }
@test "podman commit default" { @test "podman commit default" {
skip "Skipping until docker name removed from image store assumptions"
run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d --name my_ctr ${FEDORA_MINIMAL} sleep 6000" run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d --name my_ctr ${FEDORA_MINIMAL} sleep 6000"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -32,7 +31,6 @@ function setup() {
} }
@test "podman commit with message flag" { @test "podman commit with message flag" {
skip "Skipping until docker name removed from image store assumptions"
run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d --name my_ctr ${FEDORA_MINIMAL} sleep 6000" run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d --name my_ctr ${FEDORA_MINIMAL} sleep 6000"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -51,7 +49,6 @@ function setup() {
} }
@test "podman commit with author flag" { @test "podman commit with author flag" {
skip "Skipping until docker name removed from image store assumptions"
run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d --name my_ctr ${FEDORA_MINIMAL} sleep 6000" run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d --name my_ctr ${FEDORA_MINIMAL} sleep 6000"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -70,7 +67,6 @@ function setup() {
} }
@test "podman commit with change flag" { @test "podman commit with change flag" {
skip "Skipping until docker name removed from image store assumptions"
run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d --name my_ctr ${FEDORA_MINIMAL} sleep 6000" run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d --name my_ctr ${FEDORA_MINIMAL} sleep 6000"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -89,7 +85,6 @@ function setup() {
} }
@test "podman commit with pause flag" { @test "podman commit with pause flag" {
skip "Skipping until docker name removed from image store assumptions"
run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d --name my_ctr ${FEDORA_MINIMAL} sleep 6000" run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} run -d --name my_ctr ${FEDORA_MINIMAL} sleep 6000"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -108,7 +103,6 @@ function setup() {
} }
@test "podman commit non-running container" { @test "podman commit non-running container" {
skip "Skipping until docker name removed from image store assumptions"
run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} create --name my_ctr ${FEDORA_MINIMAL} ls" run bash -c "${PODMAN_BINARY} ${PODMAN_OPTIONS} create --name my_ctr ${FEDORA_MINIMAL} ls"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]