Include images tagged with c.gh.debarshiray.toolbox in 'rmi'
When '--all' is applied then first query the images with an old label, then with the new label, combine them and process them. When the exact image name is specified, then we need to check whether the image has the new or old label and only then remove it. https://github.com/debarshiray/toolbox/pull/101
This commit is contained in:
parent
a2a1836773
commit
9316d0f284
1 changed files with 17 additions and 5 deletions
22
toolbox
22
toolbox
|
@ -966,12 +966,22 @@ remove_images()
|
|||
$force && force_option="--force"
|
||||
|
||||
if $all; then
|
||||
if ! ids=$($prefix_sudo podman images \
|
||||
--filter "label=com.redhat.component=fedora-toolbox" \
|
||||
--format "{{.ID}}" 2>&3); then
|
||||
echo "$0: failed to list images" >&2
|
||||
if ! ids_old=$($prefix_sudo podman images \
|
||||
--filter "label=com.redhat.component=fedora-toolbox" \
|
||||
--format "{{.ID}}" 2>&3); then
|
||||
echo "$0: failed to list images with com.redhat.component=fedora-toolbox" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
if ! ids=$($prefix_sudo podman images \
|
||||
--all \
|
||||
--filter "label=com.github.debarshiray.toolbox=true" \
|
||||
--format "{{.ID}}" 2>&3); then
|
||||
echo "$0: failed to list images with com.github.debarshiray.toolbox=true" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
ids=$(printf "%s\n%s\n" "$ids_old" "$ids" | sort 2>&3 | uniq 2>&3)
|
||||
if [ "$ids" != "" ]; then
|
||||
ret_val=$(echo "$ids" \
|
||||
| (
|
||||
|
@ -999,7 +1009,9 @@ remove_images()
|
|||
ret_val=1
|
||||
continue
|
||||
fi
|
||||
if ! has_substring "$labels" "com.redhat.component:fedora-toolbox"; then
|
||||
|
||||
if ! has_substring "$labels" "com.github.debarshiray.toolbox" \
|
||||
&& ! has_substring "$labels" "com.redhat.component:fedora-toolbox"; then
|
||||
echo "$base_toolbox_command: $id is not a toolbox image" >&2
|
||||
ret_val=1
|
||||
continue
|
||||
|
|
Loading…
Reference in a new issue