Run docker scripts in rosetta mode on mac

DeaDBeeF-Player · Dec 22, 2024 · d80e6cc · d80e6cc
1 parent 52935d9
commit d80e6cc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/tools/docker/18.04/bootstrap.sh b/tools/docker/18.04/bootstrap.sh
@@ -3,4 +3,4 @@
 # run this script once to create the base container image,
 # which would contain all necessary dependencies and build tools
 
-docker build --progress plain -f tools/docker/18.04/Dockerfile-builder -t deadbeef-builder-player-clang-18.04 .
+docker build --platform linux/amd64 --progress plain -f tools/docker/18.04/Dockerfile-builder -t deadbeef-builder-player-clang-18.04 .
diff --git a/tools/docker/18.04/build.sh b/tools/docker/18.04/build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-docker build --progress plain -t deadbeef-clang-18.04 -f tools/docker/18.04/Dockerfile . || exit 1
+docker build --platform linux/amd64 --progress plain -t deadbeef-clang-18.04 -f tools/docker/18.04/Dockerfile . || exit 1
 mkdir -p docker-artifacts
-docker run --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-18.04 || exit 1
+docker run --platform linux/amd64 --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-18.04 || exit 1
diff --git a/tools/docker/18.04/distcheck.sh b/tools/docker/18.04/distcheck.sh
@@ -2,6 +2,6 @@
 
 set -e
 
-docker build --progress plain -t deadbeef-clang-distcheck-18.04 -f tools/docker/18.04/Dockerfile-distcheck .
+docker build --platform linux/amd64 --progress plain -t deadbeef-clang-distcheck-18.04 -f tools/docker/18.04/Dockerfile-distcheck .
 mkdir -p docker-artifacts
-docker run -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-distcheck-18.04
+docker run --platform linux/amd64 -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-distcheck-18.04
diff --git a/tools/docker/18.04/test.sh b/tools/docker/18.04/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-docker build --progress plain -t deadbeef-test-18.04 -f tools/docker/18.04/Dockerfile-test . || exit 1
-docker run --rm deadbeef-test-18.04 || exit 1
+docker build --platform linux/amd64 --progress plain -t deadbeef-test-18.04 -f tools/docker/18.04/Dockerfile-test . || exit 1
+docker run --platform linux/amd64 --rm deadbeef-test-18.04 || exit 1
 
diff --git a/tools/docker/18.04/unittest.sh b/tools/docker/18.04/unittest.sh
@@ -2,6 +2,6 @@
 
 set -e
 
-docker build --progress plain -t deadbeef-clang-unittest-18.04 -f tools/docker/18.04/Dockerfile-unittest .
+docker build --platform linux/amd64 --progress plain -t deadbeef-clang-unittest-18.04 -f tools/docker/18.04/Dockerfile-unittest .
 mkdir -p docker-artifacts
-docker run -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-unittest-18.04
+docker run --platform linux/amd64 -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-unittest-18.04