Merge pull request #185 from asfadmin/cjl/feat/apple-silicon-support

update Makefile docker commands to support Apple Silicon machines
asfadmin · Feb 13, 2024 · f7467a5 · f7467a5
2 parents 79103c9 + 8ad156c
commit f7467a5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
 # CHANGELOG
+
+## Unreleased
+
+* add `--platform linux/amd64` to all Docker commands in `Makefile` so `make image` and
+`make container-shell` work on Apple Silicon machines
+
 ## v18.0.0.1
 
 * Remove terraform lockfiles to ensure easy upgrade to v18 and ratchet provider versions

diff --git a/Makefile b/Makefile
@@ -52,11 +52,17 @@ endef
 # ---------------------------
 .PHONY: image
 image: Dockerfile
-	docker build -f Dockerfile --no-cache -t cirrus-core:$(DOCKER_TAG) --target $(PYTHON_VER) --build-arg USER=`id -u` .
+	docker build -f Dockerfile \
+		--platform linux/amd64 \
+		--no-cache \
+		-t cirrus-core:$(DOCKER_TAG) \
+		--target $(PYTHON_VER) \
+		--build-arg USER=`id -u` .
 
 .PHONY: container-shell
 container-shell:
 	docker run -it --rm \
+		--platform linux/amd64 \
 		--user `id -u` \
 		--env DAAC_DIR="/CIRRUS-DAAC" \
 		--env AWS_CONFIG_DIR="/" \