github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-04 10:26:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #893 from edsantiago/podman_info_broke

Browse Source 
Fix for yet another breaking podman change
This commit is contained in:
Miloslav Trmač 2020-04-09 14:30:21 +02:00 committed by GitHub
commit 2d91b93ad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
systemtest/010-inspect.bats
View File

@ -87,7 +87,16 @@ END_EXPECT
# 1) Get current platform arch # 1) Get current platform arch
# 2) Inspect container image is different from current platform arch # 2) Inspect container image is different from current platform arch
# 3) Compare output w/ expected result # 3) Compare output w/ expected result
arch=$(podman info --format '{{.host.arch}}')
# Here we see a revolting workaround for a podman incompatibility
# change: in April 2020, podman info completely changed format
# of the keys. What worked until then now throws an error. We
# need to work with both old and new podman.
arch=$(podman info --format '{{.host.arch}}' || true)
if [[ -z "$arch" ]]; then
arch=$(podman info --format '{{.Host.Arch}}')
fi
case $arch in case $arch in
"amd64") "amd64")
diff_arch_list="s390x ppc64le" diff_arch_list="s390x ppc64le"