From 6851060856d13578429cfab8a2ef8d8fbf5befe7 Mon Sep 17 00:00:00 2001
From: Charles Daniels <charles@styra.com>
Date: Thu, 31 Mar 2022 17:52:10 -0400
Subject: [PATCH] build cross-platform images for envoy_iptables

Signed-off-by: Charles Daniels <charles@styra.com>
---
 .github/workflows/build.yaml | 3 +++
 envoy_iptables/Makefile      | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0769f7e1..16fbea29 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -19,6 +19,9 @@ jobs:
       with:
         go-version: '^1.15.5'
 
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
     - name: Install OPA
       run: ./build/install-opa.sh
 
diff --git a/envoy_iptables/Makefile b/envoy_iptables/Makefile
index acd4835c..1f3cbf86 100644
--- a/envoy_iptables/Makefile
+++ b/envoy_iptables/Makefile
@@ -9,9 +9,8 @@ build: image
 
 .PHONY: image
 image:
-	docker build -t $(REPOSITORY):latest -t $(REPOSITORY):$(VERSION) .
+	docker buildx build --platform=linux/amd64,linux/arm64 -t $(REPOSITORY):latest -t $(REPOSITORY):$(VERSION) .
 
 .PHONY: push
 push: build
-	docker push $(REPOSITORY):$(VERSION)
-	docker push $(REPOSITORY):latest
+	docker buildx build --push --platform=linux/amd64,linux/arm64 -t $(REPOSITORY):latest -t $(REPOSITORY):$(VERSION) .