refactor ...

Author: ImreSamu

.github/workflows/arm.yml renamed to .github/workflows/buildx.yml

@@ -17,21 +17,28 @@ jobs:
       fail-fast: false
       matrix:
         #
-        platforms: ['linux/arm64','linux/arm/v7','linux/arm/v6','linux/386','linux/ppc64le']
+        platforms: ['linux/arm64','linux/arm/v7','linux/arm/v6','linux/386','linux/ppc64le','linux/mips64le','linux/s390x']
         #
-        #platforms: ['linux/arm64','linux/arm/v7','linux/arm/v5','linux/386','linux/mips64le','linux/ppc64le','linux/s390x']        
+        #platforms: ['linux/arm64','linux/arm/v7','linux/arm/v5','linux/386','linux/mips64le','linux/ppc64le','linux/s390x']
         # comments:
         #   'linux/arm/v7' - default/debian:   Unable to locate package postgresql-14-postgis-3;
         #
         postgres: [14]
         postgis: ['3.2']
-        variant: [default, alpine]
+        variant: [alpine]
         include:
-          - postgres: 15beta3
-            postgis: '3.3.0rc2'
-            variant: 'alpine'
+
+          - postgres: 14
+            postgis: '3.2'
+            variant: 'default'
             platforms: 'linux/arm64'
 
+          - postgres: 14
+            postgis: '3.2'
+            variant: 'default'
+            platforms: linux/ppc64le'
+
+
 #          - postgres: 14
 #            postgis: '3.2'
 #            variant: 'alpine'
@@ -81,7 +88,7 @@ jobs:
 
       - if: ${{ env.VARIANT == 'alpine' }}
         run: docker pull --platform=${{ matrix.platforms }} postgres:${{ matrix.postgres }}-alpine3.16 && docker inspect postgres:${{ matrix.postgres }}-alpine3.16
-        env:        
+        env:
           DOCKER_DEFAULT_PLATFORM: ${{ matrix.platforms }}
           PLATFORM: ${{ matrix.platforms }}
 

Makefile

@@ -51,8 +51,6 @@ ifeq ($(do_default),true)
 endif
 
 
-PLATFORM ?= ${PLATFORM} 
-
 # The repository and image names default to the official but can be overriden
 # via environment variables.
 REPO_NAME  ?= postgis
@@ -79,11 +77,11 @@ update:
 define build-version
 build-$1:
 ifeq ($(do_default),true)
-	$(DOCKER) build --pull --platform=$(PLATFORM) --network=host -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1) $1
+	$(DOCKER) build --pull -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1) $1
 endif
 ifeq ($(do_alpine),true)
 ifneq ("$(wildcard $1/alpine)","")
-	$(DOCKER) build --pull --platform=$(PLATFORM) --network=host --shm-size=1g --ulimit memlock=-1 -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1)-alpine $1/alpine
+	$(DOCKER) build --pull -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1)-alpine $1/alpine
 endif
 endif
 endef