Set VERSION build arg to image tag

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`).
2024-09-16 17:10:39 +02:00 · 2022-11-04 08:45:37 -04:00 · 2022-11-04 08:45:37 -04:00 · ac8bbe2b90
commit ac8bbe2b90
parent 57a27d5668
4 changed files with 39 additions and 27 deletions
--- a/52
+++ b/52
@ -116,9 +116,10 @@ $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOS
 web-wasm: web-wasm/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	cp -r test web-wasm/
-	$(DOCKER) build -t $(ORG)/web-wasm:latest \
-		-t $(ORG)/web-wasm:$(TAG) \
+	$(DOCKER) build -t $(ORG)/web-wasm:$(TAG) \
+		-t $(ORG)/web-wasm:latest \
 		--build-arg IMAGE=$(ORG)/web-wasm \
+		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
@ -128,8 +129,8 @@ web-wasm: web-wasm/Dockerfile

 web-wasm.test: web-wasm
 	cp -r test web-wasm/
-	$(DOCKER) run $(RM) $(ORG)/web-wasm > $(BIN)/dockcross-web-wasm && chmod +x $(BIN)/dockcross-web-wasm
-	$(BIN)/dockcross-web-wasm python test/run.py --exe-suffix ".js"
+	$(DOCKER) run $(RM) $(ORG)/web-wasm:latest > $(BIN)/dockcross-web-wasm && chmod +x $(BIN)/dockcross-web-wasm
+	$(BIN)/dockcross-web-wasm -i $(ORG)/web-wasm:latest python test/run.py --exe-suffix ".js"
 	rm -rf web-wasm/test

 #
@ -141,9 +142,10 @@ manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile
 	@# Get libstdc++ from quay.io/pypa/manylinux2014_aarch64 container
 	docker run -v `pwd`:/host --rm -e LIB_PATH=/host/$@/xc_script/ quay.io/pypa/manylinux2014_aarch64 bash -c "PASS=1 /host/$@/xc_script/docker_setup_scrpits/copy_libstd.sh"
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:latest \
-		-t $(ORG)/manylinux2014-aarch64:$(TAG) \
+	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:$(TAG) \
+		-t $(ORG)/manylinux2014-aarch64:latest \
 		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \
+		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
@ -153,18 +155,19 @@ manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile
 	docker run -v `pwd`:/host --rm quay.io/pypa/manylinux2014_aarch64 bash -c "rm -rf /host/$@/xc_script/usr"

 manylinux2014-aarch64.test: manylinux2014-aarch64
-	$(DOCKER) run $(RM) $(ORG)/manylinux2014-aarch64 > $(BIN)/dockcross-manylinux2014-aarch64 \
+	$(DOCKER) run $(RM) $(ORG)/manylinux2014-aarch64:latest > $(BIN)/dockcross-manylinux2014-aarch64 \
 		&& chmod +x $(BIN)/dockcross-manylinux2014-aarch64
-	$(BIN)/dockcross-manylinux2014-aarch64 /opt/python/cp38-cp38/bin/python test/run.py
+	$(BIN)/dockcross-manylinux2014-aarch64 -i $(ORG)/manylinux2014-aarch64:latest /opt/python/cp38-cp38/bin/python test/run.py

 #
 # manylinux_2_28-x64
 #
 manylinux_2_28-x64: manylinux_2_28-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(DOCKER) build -t $(ORG)/manylinux_2_28-x64:latest \
-		-t $(ORG)/manylinux_2_28-x64:$(TAG) \
+	$(DOCKER) build -t $(ORG)/manylinux_2_28-x64:$(TAG) \
+		-t $(ORG)/manylinux_2_28-x64:latest \
 		--build-arg IMAGE=$(ORG)/manylinux_2_28-x64 \
+		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
@ -172,18 +175,19 @@ manylinux_2_28-x64: manylinux_2_28-x64/Dockerfile
 	rm -rf $@/imagefiles

 manylinux_2_28-x64.test: manylinux_2_28-x64
-	$(DOCKER) run $(RM) $(ORG)/manylinux_2_28-x64 > $(BIN)/dockcross-manylinux_2_28-x64 \
+	$(DOCKER) run $(RM) $(ORG)/manylinux_2_28-x64:latest > $(BIN)/dockcross-manylinux_2_28-x64 \
 		&& chmod +x $(BIN)/dockcross-manylinux_2_28-x64
-	$(BIN)/dockcross-manylinux_2_28-x64 /opt/python/cp310-cp310/bin/python test/run.py
+	$(BIN)/dockcross-manylinux_2_28-x64 -i $(ORG)/manylinux_2_28-x64:latest /opt/python/cp310-cp310/bin/python test/run.py

 #
 # manylinux2014-x64
 #
 manylinux2014-x64: manylinux2014-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(DOCKER) build -t $(ORG)/manylinux2014-x64:latest \
-		-t $(ORG)/manylinux2014-x64:$(TAG) \
+	$(DOCKER) build -t $(ORG)/manylinux2014-x64:$(TAG) \
+		-t $(ORG)/manylinux2014-x64:latest \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \
+		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
@ -191,18 +195,19 @@ manylinux2014-x64: manylinux2014-x64/Dockerfile
 	rm -rf $@/imagefiles

 manylinux2014-x64.test: manylinux2014-x64
-	$(DOCKER) run $(RM) $(ORG)/manylinux2014-x64 > $(BIN)/dockcross-manylinux2014-x64 \
+	$(DOCKER) run $(RM) $(ORG)/manylinux2014-x64:latest > $(BIN)/dockcross-manylinux2014-x64 \
 		&& chmod +x $(BIN)/dockcross-manylinux2014-x64
-	$(BIN)/dockcross-manylinux2014-x64 /opt/python/cp38-cp38/bin/python test/run.py
+	$(BIN)/dockcross-manylinux2014-x64 -i $(ORG)/manylinux2014-x64:latest /opt/python/cp38-cp38/bin/python test/run.py

 #
 # manylinux2014-x86
 #
 manylinux2014-x86: manylinux2014-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(DOCKER) build -t $(ORG)/manylinux2014-x86:latest \
-		-t $(ORG)/manylinux2014-x86:$(TAG) \
+	$(DOCKER) build -t $(ORG)/manylinux2014-x86:$(TAG) \
+		-t $(ORG)/manylinux2014-x86:latest \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \
+		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
@ -210,9 +215,9 @@ manylinux2014-x86: manylinux2014-x86/Dockerfile
 	rm -rf $@/imagefiles

 manylinux2014-x86.test: manylinux2014-x86
-	$(DOCKER) run $(RM) $(ORG)/manylinux2014-x86 > $(BIN)/dockcross-manylinux2014-x86 \
+	$(DOCKER) run $(RM) $(ORG)/manylinux2014-x86:latest > $(BIN)/dockcross-manylinux2014-x86 \
 		&& chmod +x $(BIN)/dockcross-manylinux2014-x86
-	$(BIN)/dockcross-manylinux2014-x86 /opt/python/cp38-cp38/bin/python test/run.py
+	$(BIN)/dockcross-manylinux2014-x86 -i $(ORG)/manylinux2014-x86:latest /opt/python/cp38-cp38/bin/python test/run.py

 #
 # base
@ -225,7 +230,7 @@ base: Dockerfile imagefiles/
 		.

 base.test: base
-	$(DOCKER) run $(RM) $(ORG)/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
+	$(DOCKER) run $(RM) $(ORG)/base:latest > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base

 # display
 #
@ -243,6 +248,7 @@ $(STANDARD_IMAGES): %: %/Dockerfile base
 	$(DOCKER) build -t $(ORG)/$@:latest \
 		-t $(ORG)/$@:$(TAG) \
 		--build-arg IMAGE=$(ORG)/$@ \
+		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
@ -271,9 +277,9 @@ bash-check:
 #
 .SECONDEXPANSION:
 $(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@)
-	$(DOCKER) run $(RM) $(ORG)/$(basename $@) > $(BIN)/dockcross-$(basename $@) \
+	$(DOCKER) run $(RM) $(ORG)/$(basename $@):latest > $(BIN)/dockcross-$(basename $@) \
 		&& chmod +x $(BIN)/dockcross-$(basename $@)
-	$(BIN)/dockcross-$(basename $@) python3 test/run.py $($@_ARGS)
+	$(BIN)/dockcross-$(basename $@) -i $(ORG)/$(basename $@):latest python3 test/run.py $($@_ARGS)

 #
 # testing prerequisites implicit rule
--- a/tools/dockcross-cmake-builder.sh
+++ b/tools/dockcross-cmake-builder.sh
@ -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
--- a/tools/dockcross-command.sh
+++ b/tools/dockcross-command.sh
@ -4,6 +4,9 @@ if (( $# >= 2 )); then
    image_complet=$1
    image=${image_complet%:*}
    tag=${image_complet#*:}
+    if test $tag = $image; then
+        tag="latest"
+    fi
    shift 1

    command=$*
@ -17,7 +20,7 @@ if (( $# >= 2 )); then
    chmod +x ./dockcross-"$image"
    
    echo "Run command in dockcross-$image"
-    ./dockcross-"$image" $command
+    ./dockcross-"$image" -i dockcross/"$image:$tag" $command
 else
    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <command>"
    exit 1
--- a/tools/dockcross-make-builder.sh
+++ b/tools/dockcross-make-builder.sh
@ -18,7 +18,7 @@ if (( $# >= 1 )); then
    chmod +x ./dockcross-"$image"

    echo "Build $build_file"
-    ./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
+    ./dockcross-"$image" -i dockcross/"$image":latest bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
 else
    echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
    exit 1