db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-12-21 23:47:33 +02:00
Code Issues Releases Activity

Improve support for multi-architecture builds.

Browse Source 
On recent versions of Docker it is not necessary to specify the architecture of the require image. The --platform option takes care of it.

Rebuild test images that were modified by this change.
This commit is contained in:
David Steele
2025-10-04 13:34:53 +02:00
parent 96b4b474ce
commit 24802a08b4
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/container.yaml
View File

@@ -16,6 +16,12 @@
aarch64: aarch64:
u22: 1e0f3dbc1772764b31ffdac85a1d1c24abe97cb3 u22: 1e0f3dbc1772764b31ffdac85a1d1c24abe97cb3
ppc64le:
u22: ff068e44059b064f963bf450831d7733611b8fab
s390x:
u22: ff068e44059b064f963bf450831d7733611b8fab
20250926A: 20250926A:
x86_64: x86_64:
u22: 1e0f3dbc1772764b31ffdac85a1d1c24abe97cb3 u22: 1e0f3dbc1772764b31ffdac85a1d1c24abe97cb3
@@ -26,9 +32,3 @@
d11: be044bf120ca3e7d8bed69d5a83b4de4926be87f d11: be044bf120ca3e7d8bed69d5a83b4de4926be87f
f42: f1c2eceeed7b66d8096a9b891f28eb30f141d1b2 f42: f1c2eceeed7b66d8096a9b891f28eb30f141d1b2
rh8: 4d141c845abfbdbf402ba447cf2bd2e4357c8a63 rh8: 4d141c845abfbdbf402ba447cf2bd2e4357c8a63
ppc64le:
u22: cf3637d799de2b3d847f74777c839271b5c8e268
s390x:
u22: 131ba5585c13943dd950d5aa025ac73ac7c30767

4
test/lib/pgBackRestTest/Common/ContainerTest.pm
View File

@@ -396,9 +396,7 @@ sub containerBuild
# Base image # Base image
########################################################################################################################### ###########################################################################################################################
my $strImageParent = my $strImageParent = $oVm->{$strOS}{&VM_IMAGE};
(defined($strArch) ? "${strArch}/" : (vmArch($strOS) eq VM_ARCH_X86_64 ? '' : vmArch($strOS) . '/')) .
"$$oVm{$strOS}{&VM_IMAGE}";
$strArch = defined($strArch) ? $strArch : hostArch(); $strArch = defined($strArch) ? $strArch : hostArch();
my $strImage = "${strOS}-base" . (defined($strArch) ? "-${strArch}" : '-' . hostArch()); my $strImage = "${strOS}-base" . (defined($strArch) ? "-${strArch}" : '-' . hostArch());
my $strCopy = undef; my $strCopy = undef;