Skip to content

Fixed Apple M1 chip docker build #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 18, 2021
Merged

Fixed Apple M1 chip docker build #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02d9cac
Fixed Apple M1 chip docker build
Dmdv Jun 12, 2021
d348608
Updated docs
Dmdv Jun 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 15 additions & 2 deletions docker.local/bin/build.blobber-integration-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 15 additions & 2 deletions docker.local/bin/build.blobber.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down