build images for both linux/amd64 & linux/arm64 archs

WengerK · Feb 20, 2024 · 0ca1633 · 0ca1633
1 parent 9282110
commit 0ca1633
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/container-structure-test.yml b/.github/workflows/container-structure-test.yml
@@ -50,6 +50,7 @@ jobs:
       ', github.ref)
     strategy:
       matrix:
+        platforms: 'linux/amd64,linux/arm64'
         drupal_version: ['8.9', '9.0', '9.1', '9.2', '9.3', '9.4', '9.5', '10.0', '10.1']
         include:
           - drupal_version: '8.9'
@@ -74,7 +75,7 @@ jobs:
       - name: checkout source
         uses: actions/checkout@master
       - name: Build docker images
-        run: make
+        run: ARCH_TO_BUILD=${{ matrix.platforms }} make
         working-directory: ${{ matrix.drupal_major }}/${{ matrix.drupal_version }}
       -
         name: Login to DockerHub

diff --git a/10/10.0/Makefile b/10/10.0/Makefile
@@ -2,6 +2,7 @@ DRUPAL_VER ?= 10.0
 DRUPAL_VER_MAJOR ?= $(shell echo "${DRUPAL_VER}" | grep -oE '^[0-9]+\.[0-9]+')
 
 BASE_IMAGE_TAG = 10.0
+ARCH_TO_BUILD ?= "linux/amd64"
 
 REPO = wengerk/drupal-for-contrib
 NAME = drupal-$(DRUPAL_VER_MAJOR)
@@ -23,13 +24,15 @@ endif
 default: build
 
 build:
-	docker build -t $(REPO):$(TAG) \
+	docker buildx build -t $(REPO):$(TAG) \
+		--platform=${ARCH_TO_BUILD} \
 		--build-arg BASE_IMAGE_TAG=$(BASE_IMAGE_TAG) \
 		--build-arg DRUPAL_VER=$(DRUPAL_VER) \
 		./
 
 build-nc:
-	docker build -t $(REPO):$(TAG) \
+	docker buildx build -t $(REPO):$(TAG) \
+		--platform=${ARCH_TO_BUILD} \
 		--build-arg BASE_IMAGE_TAG=$(BASE_IMAGE_TAG) \
 		--build-arg DRUPAL_VER=$(DRUPAL_VER) \
 		--no-cache --pull \

diff --git a/10/10.1/Makefile b/10/10.1/Makefile
@@ -2,6 +2,7 @@ DRUPAL_VER ?= 10.1
 DRUPAL_VER_MAJOR ?= $(shell echo "${DRUPAL_VER}" | grep -oE '^[0-9]+\.[0-9]+')
 
 BASE_IMAGE_TAG = 10.0
+ARCH_TO_BUILD ?= "linux/amd64"
 
 REPO = wengerk/drupal-for-contrib
 NAME = drupal-$(DRUPAL_VER_MAJOR)
@@ -23,13 +24,15 @@ endif
 default: build
 
 build:
-	docker build -t $(REPO):$(TAG) \
+	docker buildx build -t $(REPO):$(TAG) \
+		--platform=${ARCH_TO_BUILD} \
 		--build-arg BASE_IMAGE_TAG=$(BASE_IMAGE_TAG) \
 		--build-arg DRUPAL_VER=$(DRUPAL_VER) \
 		./
 
 build-nc:
-	docker build -t $(REPO):$(TAG) \
+	docker buildx build -t $(REPO):$(TAG) \
+		--platform=${ARCH_TO_BUILD} \
 		--build-arg BASE_IMAGE_TAG=$(BASE_IMAGE_TAG) \
 		--build-arg DRUPAL_VER=$(DRUPAL_VER) \
 		--no-cache --pull \