From d0665c09a7258e8bc54b201690551fdeff3c34f7 Mon Sep 17 00:00:00 2001 From: Chris Porter Date: Tue, 30 Apr 2024 05:22:59 -0500 Subject: [PATCH] Release: attempt to fix docker manifest create command This effectively reverts PR 366 and drops the guarding quotes around extra_docker_manifest_flags that were added to these commands in 351. The CI is still throwing an error to the effect of: "error parsing name for manifest list : invalid reference format". This seems to stem from an empty string in the command b/c of an empty extra_docker_manifest_flag variable. Hence, we are reverting quotes that were added around it in PR 351. Signed-off-by: Chris Porter --- install/pre-install-payload/payload.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/install/pre-install-payload/payload.sh b/install/pre-install-payload/payload.sh index a5057e21..78a427c8 100755 --- a/install/pre-install-payload/payload.sh +++ b/install/pre-install-payload/payload.sh @@ -81,18 +81,18 @@ function build_payload() { purge_previous_manifests "${registry}:${tag}" purge_previous_manifests "${registry}:latest" - docker manifest create "${extra_docker_manifest_flags}" \ + docker manifest create ${extra_docker_manifest_flags} \ "${registry}:${tag}" \ - "${registry}:x86_64-${tag}" \ - "${registry}:s390x-${tag}" + --amend "${registry}:x86_64-${tag}" \ + --amend "${registry}:s390x-${tag}" - docker manifest create "${extra_docker_manifest_flags}" \ + docker manifest create ${extra_docker_manifest_flags} \ "${registry}:latest" \ - "${registry}:x86_64-${tag}" \ - "${registry}:s390x-${tag}" + --amend "${registry}:x86_64-${tag}" \ + --amend "${registry}:s390x-${tag}" - docker manifest push "${extra_docker_manifest_flags}" "${registry}:${tag}" - docker manifest push "${extra_docker_manifest_flags}" "${registry}:latest" + docker manifest push ${extra_docker_manifest_flags} "${registry}:${tag}" + docker manifest push ${extra_docker_manifest_flags} "${registry}:latest" popd }