Skip to content

Commit d80e6cc

Browse files
Run docker scripts in rosetta mode on mac
1 parent 52935d9 commit d80e6cc

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

tools/docker/18.04/bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# run this script once to create the base container image,
44
# which would contain all necessary dependencies and build tools
55

6-
docker build --progress plain -f tools/docker/18.04/Dockerfile-builder -t deadbeef-builder-player-clang-18.04 .
6+
docker build --platform linux/amd64 --progress plain -f tools/docker/18.04/Dockerfile-builder -t deadbeef-builder-player-clang-18.04 .

tools/docker/18.04/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
22

3-
docker build --progress plain -t deadbeef-clang-18.04 -f tools/docker/18.04/Dockerfile . || exit 1
3+
docker build --platform linux/amd64 --progress plain -t deadbeef-clang-18.04 -f tools/docker/18.04/Dockerfile . || exit 1
44
mkdir -p docker-artifacts
5-
docker run --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-18.04 || exit 1
5+
docker run --platform linux/amd64 --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-18.04 || exit 1

tools/docker/18.04/distcheck.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
set -e
44

5-
docker build --progress plain -t deadbeef-clang-distcheck-18.04 -f tools/docker/18.04/Dockerfile-distcheck .
5+
docker build --platform linux/amd64 --progress plain -t deadbeef-clang-distcheck-18.04 -f tools/docker/18.04/Dockerfile-distcheck .
66
mkdir -p docker-artifacts
7-
docker run -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-distcheck-18.04
7+
docker run --platform linux/amd64 -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-distcheck-18.04

tools/docker/18.04/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
22

3-
docker build --progress plain -t deadbeef-test-18.04 -f tools/docker/18.04/Dockerfile-test . || exit 1
4-
docker run --rm deadbeef-test-18.04 || exit 1
3+
docker build --platform linux/amd64 --progress plain -t deadbeef-test-18.04 -f tools/docker/18.04/Dockerfile-test . || exit 1
4+
docker run --platform linux/amd64 --rm deadbeef-test-18.04 || exit 1
55

tools/docker/18.04/unittest.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
set -e
44

5-
docker build --progress plain -t deadbeef-clang-unittest-18.04 -f tools/docker/18.04/Dockerfile-unittest .
5+
docker build --platform linux/amd64 --progress plain -t deadbeef-clang-unittest-18.04 -f tools/docker/18.04/Dockerfile-unittest .
66
mkdir -p docker-artifacts
7-
docker run -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-unittest-18.04
7+
docker run --platform linux/amd64 -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-unittest-18.04

0 commit comments

Comments
 (0)