Include containers tagged with c.gh.debarshiray.toolbox in 'list'
First we need to get the containers with an old label and then with the new label. We have to change the format of the query to only include the name of the containers and not the other informations like 'created' as they could make a problem when removing the duplicates with uniq. When we have the final list of containers we pass them to containers_get_details() where we obtain the final details for them. https://github.com/debarshiray/toolbox/pull/101
This commit is contained in:
parent
92cc1a15d6
commit
ea5558cab0
1 changed files with 41 additions and 7 deletions
48
toolbox
48
toolbox
|
@ -799,17 +799,51 @@ list_images()
|
|||
)
|
||||
|
||||
|
||||
list_containers()
|
||||
containers_get_details()
|
||||
(
|
||||
if ! containers=$($prefix_sudo podman ps \
|
||||
--all \
|
||||
--filter "label=com.redhat.component=fedora-toolbox" \
|
||||
--format "{{.ID}} {{.Names}} {{.Created}} {{.Status}} {{.Image}}" 2>&3); then
|
||||
echo "$base_toolbox_command: failed to list containers" >&2
|
||||
containers="$1"
|
||||
|
||||
if ! echo "$containers" | while read -r container; do
|
||||
[ "$container" = "" ] 2>&3 && continue
|
||||
|
||||
if ! $prefix_sudo podman ps --all \
|
||||
--filter "name=$container" \
|
||||
--format "{{.ID}} {{.Names}} {{.Created}} {{.Status}} {{.Image}}" 2>&3; then
|
||||
echo "$base_toolbox_command: failed to get details for container $container" >&2
|
||||
return 1
|
||||
fi
|
||||
done; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
if ! output=$(echo "$containers" \
|
||||
return 0
|
||||
)
|
||||
|
||||
|
||||
list_containers()
|
||||
(
|
||||
if ! containers_old=$($prefix_sudo podman ps \
|
||||
--all \
|
||||
--filter "label=com.redhat.component=fedora-toolbox" \
|
||||
--format "{{.Names}}" 2>&3); then
|
||||
echo "$base_toolbox_command: failed to list containers with com.redhat.component=fedora-toolbox" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
if ! containers=$($prefix_sudo podman ps \
|
||||
--all \
|
||||
--filter "label=com.github.debarshiray.toolbox=true" \
|
||||
--format "{{.Names}}" 2>&3); then
|
||||
echo "$base_toolbox_command: failed to list containers com.github.debarshiray.toolbox=true" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
containers=$(printf "%s\n%s\n" "$containers_old" "$containers" | sort 2>&3 | uniq 2>&3)
|
||||
if ! details=$(containers_get_details "$containers"); then
|
||||
return 1
|
||||
fi
|
||||
|
||||
if ! output=$(echo "$details" \
|
||||
| sed "s/ \{2,\}/\t/g" 2>&3 \
|
||||
| column \
|
||||
--separator "$tab" \
|
||||
|
|
Loading…
Reference in a new issue