From 02d9cacd895a3a30a931eb41eb94ac1b66d945be Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 12 Jun 2021 13:42:27 +0300 Subject: [PATCH 1/2] Fixed Apple M1 chip docker build --- .../bin/build.blobber-integration-tests.sh | 17 +++++++++++++++-- docker.local/bin/build.blobber.sh | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/docker.local/bin/build.blobber-integration-tests.sh b/docker.local/bin/build.blobber-integration-tests.sh index 69b76eff7..895d5974c 100755 --- a/docker.local/bin/build.blobber-integration-tests.sh +++ b/docker.local/bin/build.blobber-integration-tests.sh @@ -4,8 +4,21 @@ set -e GIT_COMMIT=$(git rev-list -1 HEAD) echo $GIT_COMMIT -docker build --build-arg GIT_COMMIT=$GIT_COMMIT -f docker.local/ValidatorDockerfile . -t validator -docker build --build-arg GIT_COMMIT=$GIT_COMMIT -f docker.local/IntegrationTestsBlobberDockerfile . -t blobber +cmd="build" + +for arg in "$@" +do + case $arg in + -m1|--m1|m1) + echo "The build will be performed for Apple M1 chip" + cmd="buildx build --platform linux/amd64" + shift + ;; + esac +done + +docker $cmd --build-arg GIT_COMMIT=$GIT_COMMIT -f docker.local/ValidatorDockerfile . -t validator +docker $cmd --build-arg GIT_COMMIT=$GIT_COMMIT -f docker.local/IntegrationTestsBlobberDockerfile . -t blobber for i in $(seq 1 6); do diff --git a/docker.local/bin/build.blobber.sh b/docker.local/bin/build.blobber.sh index 6b27f854c..4cd4fda82 100755 --- a/docker.local/bin/build.blobber.sh +++ b/docker.local/bin/build.blobber.sh @@ -4,8 +4,21 @@ set -e GIT_COMMIT=$(git rev-list -1 HEAD) echo $GIT_COMMIT -docker build --build-arg GIT_COMMIT=$GIT_COMMIT -f docker.local/ValidatorDockerfile . -t validator -docker build --build-arg GIT_COMMIT=$GIT_COMMIT -f docker.local/Dockerfile . -t blobber +cmd="build" + +for arg in "$@" +do + case $arg in + -m1|--m1|m1) + echo "The build will be performed for Apple M1 chip" + cmd="buildx build --platform linux/amd64" + shift + ;; + esac +done + +docker $cmd --build-arg GIT_COMMIT=$GIT_COMMIT -f docker.local/ValidatorDockerfile . -t validator +docker $cmd --build-arg GIT_COMMIT=$GIT_COMMIT -f docker.local/Dockerfile . -t blobber for i in $(seq 1 6); do From d348608f5f2f4764d75bdbdc164bbe1ba4d9af1b Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 12 Jun 2021 13:49:42 +0300 Subject: [PATCH 2/2] Updated docs --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 08f70ce00..be0469906 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,14 @@ $ docker network create --driver=bridge --subnet=198.18.0.0/15 --gateway=198.18. $ ./docker.local/bin/build.blobber.sh ``` - + +For Apple M1 chip builds: + +``` + +$ ./docker.local/bin/build.blobber.sh -m1 + +``` 3. After building the container for blobber, go to Blobber1 directory (git/blobber/docker.local/blobber1) and run the container using