Skip to content

Commit 6adbb6d

Browse files
committed
Use buildx to support multiarch images
1 parent 4255bb2 commit 6adbb6d

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

Makefile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TAGS ?= 81 81-fpm 81-unit 82 82-fpm 82-unit
44
COMPOSER_HASH ?= 55ce33d7678c5a611085589f1f3ddf8b3c52d662cd01d4ba75c0ee0459970c2200a51f492d557530c71c15d8dba01eae
55
DRUSH_VERSION ?= 8.4.12
66
DOCKER_BUILDKIT ?= 1
7-
PLATFORM ?= linux/amd64
7+
PLATFORM ?= linux/amd64,linux/arm64
88

99
.PHONY: all build push
1010

@@ -14,7 +14,6 @@ build:
1414
@echo "Building images for tags: $(TAGS)"
1515
set -e; for i in $(TAGS); do printf "\nBuilding $(NAME):$$i \n\n"; cd php$$i; \
1616
DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker build -t $(NAME):$$i \
17-
--platform $(PLATFORM) \
1817
--no-cache --progress=plain \
1918
--build-arg COMPOSER_HASH=$(COMPOSER_HASH) \
2019
--build-arg DRUSH_VERSION=$(DRUSH_VERSION) \
@@ -28,3 +27,15 @@ push:
2827

2928
unit:
3029
make -C unit-php-builder/dev build
30+
31+
buildx-push:
32+
@echo "Building images for tags: $(TAGS)"
33+
set -e; for i in $(TAGS); do printf "\nBuilding $(NAME):$$i \n\n"; cd php$$i; \
34+
docker buildx build -t $(NAME):$$i --push \
35+
--platform $(PLATFORM) \
36+
--no-cache --progress=plain \
37+
--build-arg COMPOSER_HASH=$(COMPOSER_HASH) \
38+
--build-arg DRUSH_VERSION=$(DRUSH_VERSION) \
39+
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
40+
--build-arg VCS_REF=`git rev-parse --short HEAD` .; \
41+
cd ..; done

0 commit comments

Comments
 (0)