Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-21 18:33:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set VERSION build arg to image tag

Browse Source 
This impacts the DEFAULT_DOCKCROSS_IMAGE in common.label-and-env which
determines the default image version used by the dockcross script. We
want the same tagged version of the image to be used its generated dockcross script (not `latest`).
This commit is contained in:
Matt McCormick
2022-11-04 08:45:37 -04:00
parent 57a27d5668
commit ac8bbe2b90
4 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,9 @@ if (( $# >= 1 )); then
image=${image_complet%:*}
tag=${image_complet#*:}
build_file=build-$image
if test $tag = $image; then
tag="latest"
fi
shift 1
cmake_arg=$*
@ -18,8 +21,8 @@ if (( $# >= 1 )); then
chmod +x ./dockcross-"$image"
echo "Build $build_file"
./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg
./dockcross-"$image" ninja -C "$build_file"
./dockcross-"$image" -i dockcross/"$image:$tag" cmake -B "$build_file" -S . -G Ninja $cmake_arg
./dockcross-"$image" -i dockcross/"$image:$tag" ninja -C "$build_file"
else
echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
exit 1