gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build rust docker images for linux/amd64

Browse Source
This commit is contained in:
Michael Vines
2022-04-08 14:31:32 -04:00
parent a5e740431a
commit 8f9554b5b9
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci/docker-rust-nightly/build.sh
View File

@ -3,8 +3,14 @@ set -ex
cd "$(dirname "$0")" cd "$(dirname "$0")"
platform=()
if [[ $(uname -m) = arm64 ]]; then
# Ref: https://blog.jaimyn.dev/how-to-build-multi-architecture-docker-images-on-an-m1-mac/#tldr
platform+=(--platform linux/amd64)
fi
nightlyDate=${1:-$(date +%Y-%m-%d)} nightlyDate=${1:-$(date +%Y-%m-%d)}
docker build -t solanalabs/rust-nightly:"$nightlyDate" --build-arg date="$nightlyDate" . docker build "${platform[@]}" -t solanalabs/rust-nightly:"$nightlyDate" --build-arg date="$nightlyDate" .
maybeEcho= maybeEcho=
if [[ -z $CI ]]; then if [[ -z $CI ]]; then

9
ci/docker-rust/build.sh
View File

@ -3,7 +3,14 @@ set -ex
cd "$(dirname "$0")" cd "$(dirname "$0")"
docker build -t solanalabs/rust .
platform=()
if [[ $(uname -m) = arm64 ]]; then
# Ref: https://blog.jaimyn.dev/how-to-build-multi-architecture-docker-images-on-an-m1-mac/#tldr
platform+=(--platform linux/amd64)
fi
docker build "${platform[@]}" -t solanalabs/rust .
read -r rustc version _ < <(docker run solanalabs/rust rustc --version) read -r rustc version _ < <(docker run solanalabs/rust rustc --version)
[[ $rustc = rustc ]] [[ $rustc = rustc ]]