Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-10-30 23:56:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

dockcross-cmake-builder.sh: use multiarch image when available

Browse Source
This commit is contained in:
Matt McCormick
2025-02-20 16:45:45 -05:00
parent 7577ed208d
commit 055c60ebab
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/dockcross-cmake-builder.sh
View File

@@ -1,12 +1,20 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -x
if (( $# >= 1 )); then if (( $# >= 1 )); then
image_complet=$1 image_complete=$1
image=${image_complet%:*} image=${image_complete%:*}
tag=${image_complet#*:} tag=${image_complete#*:}
build_file=build-$image build_file=build-$image
host_arch=$(uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')
if test $tag = $image; then if test $tag = $image; then
tag="latest" # use multiarch image if available
if docker images | grep dockcross/${image} | grep latest-${host_arch} >/dev/null; then
tag="latest-${host_arch}"
else
tag="latest"
fi
fi fi
shift 1 shift 1
@@ -17,7 +25,7 @@ if (( $# >= 1 )); then
# docker pull "dockcross/$image:$tag" # docker pull "dockcross/$image:$tag"
echo "Make script dockcross-$image" echo "Make script dockcross-$image"
docker run --rm dockcross/"$image" > ./dockcross-"$image" docker run --rm dockcross/"$image:$tag" > ./dockcross-"$image"
chmod +x ./dockcross-"$image" chmod +x ./dockcross-"$image"
echo "Build $build_file" echo "Build $build_file"