Merge branch 'main' into upgrade_fixes

Author: Schmaetz

Makefile

@@ -14,6 +14,7 @@ PGBACKREST_VERSION ?= 2.50
 POSTGIS_VERSION ?= 34
 PACKAGER ?= dnf
 BUILD ?= 1
+ARCH ?= amd64
 IMAGE_TAG ?= $(BASEOS)-$(PGVERSION_FULL)-$(BUILD)
 POSTGIS_IMAGE_TAG ?= $(BASEOS)-$(PGVERSION_FULL)-$(POSTGIS_VERSION)-$(BUILD)
 ARCH ?= amd64
@@ -96,7 +97,8 @@ postgres-stage-build:
 			--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION) 							\
 			--build-arg PATRONI_VERSION=$(PATRONI_VERSION) 									\
 			--build-arg OLD_PG_VERSIONS="$(OLD_PG_VERSIONS)"								\
-			--build-arg PGVERSION=$(PGVERSION)							
+			--build-arg PGVERSION=$(PGVERSION)												\
+			--build-arg ARCH=$(ARCH)
 
 postgres-stage: postgres-stage-build