From 2684f3b1af2bb936b09ffb78bdf1e6686e28e7d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20FIDRY?=
 <5175937+theofidry@users.noreply.github.com>
Date: Sat, 7 Oct 2023 09:12:02 +0200
Subject: [PATCH] build: Fix docker run command on OSX M1 (#1027)

---
 Makefile.e2e | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.e2e b/Makefile.e2e
index 9d202aa41..26f61deb1 100644
--- a/Makefile.e2e
+++ b/Makefile.e2e
@@ -3,6 +3,7 @@ MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
 DOCKER_RUN = docker run --interactive --platform=linux/amd64 --rm --workdir=/opt/box
+DOCKER_RUN_NO_PULL = docker run --interactive --platform=linux/amd64 --rm --pull=never
 # Matches the minimum PHP version supported by Box.
 DOCKER_MIN_BOX_VERSION_IMAGE_TAG = ghcr.io/box-project/box_php81
 DOCKER_MIN_BOX_XDEBUG_PHP_VERSION_IMAGE_TAG = ghcr.io/box-project/box_php81_xdebug
@@ -366,7 +367,7 @@ _e2e_dockerfile: $(SCOPED_BOX_BIN)
 	@mkdir -p $(E2E_DOCKERFILE_OUTPUT_DIR)
 
 	docker buildx build $(shell dirname $(E2E_DOCKERFILE_DOCKERFILE)) --platform=linux/amd64 --tag=$(E2E_DOCKERFILE_IMAGE_TAG)
-	docker run --interactive --pull=never --rm $(E2E_DOCKERFILE_IMAGE_TAG) \
+	$(DOCKER_RUN_NO_PULL) $(E2E_DOCKERFILE_IMAGE_TAG) \
 		1>$(E2E_DOCKERFILE_ACTUAL_STDOUT) \
 		2>$(E2E_DOCKERFILE_ACTUAL_STDERR)
 
@@ -383,7 +384,7 @@ _e2e_dockerfile_no_extension: $(SCOPED_BOX_BIN)
 	@mkdir -p $(E2E_DOCKERFILE_NO_EXT_OUTPUT_DIR)
 
 	docker buildx build $(shell dirname $(E2E_DOCKERFILE_NO_EXT_DOCKERFILE)) --platform=linux/amd64 --tag=$(E2E_DOCKERFILE_NOT_EXT_IMAGE_TAG)
-	docker run --interactive --pull=never --rm $(E2E_DOCKERFILE_NOT_EXT_IMAGE_TAG) \
+	$(DOCKER_RUN_NO_PULL) $(E2E_DOCKERFILE_NOT_EXT_IMAGE_TAG) \
 		1>$(E2E_DOCKERFILE_NO_EXT_ACTUAL_STDOUT) \
 		2>$(E2E_DOCKERFILE_NO_EXT_ACTUAL_STDERR)