fixes for building docker image from git tag

Author: rectalogic

.github/workflows/ci.yml

@@ -72,12 +72,14 @@ jobs:
         run: |
           export TARGET=opengl
           export UBUNTU=${{ matrix.ubuntu }}
+          export TAG=ghcr.io/rectalogic/renderwindow:${UBUNTU}-${{ github.ref_name }}
           builders/Linux/docker-run.sh
       - name: Build renderwindow vulkan
         if: matrix.ubuntu == 'noble'
         run: |
           export TARGET=vulkan
           export UBUNTU=${{ matrix.ubuntu }}
+          export TAG=ghcr.io/rectalogic/renderwindow:${UBUNTU}-${{ github.ref_name }}
           builders/Linux/docker-run.sh
       - name: Archive
         id: archive

builders/Linux/docker-build.sh

@@ -18,4 +18,5 @@ if [[ ! $QTACCOUNT ]]; then
     fi
 fi
 
-docker buildx build --secret id=qtaccount,src="$QTACCOUNT" --build-arg UBUNTU=${UBUNTU:-noble} --build-arg QT_VER=${QT_VER:?} --build-arg QT_INSTALLER_VER=${QT_INSTALLER_VER:?} --platform linux/amd64 --memory-swap -1 --load --tag ghcr.io/rectalogic/renderwindow:${UBUNTU:-noble}-$(git branch --show-current) --file "${CURRENT}/Dockerfile" "${CURRENT}/.."
+TAG=${TAG:-ghcr.io/rectalogic/renderwindow:${UBUNTU:-noble}-$(git branch --show-current)}
+docker buildx build --secret id=qtaccount,src="$QTACCOUNT" --build-arg UBUNTU=${UBUNTU:-noble} --build-arg QT_VER=${QT_VER:?} --build-arg QT_INSTALLER_VER=${QT_INSTALLER_VER:?} --platform linux/amd64 --memory-swap -1 --load --tag ${TAG} --file "${CURRENT}/Dockerfile" "${CURRENT}/.."

builders/Linux/docker-run.sh

@@ -6,5 +6,6 @@ MOUNT="$(cd "${BASH_SOURCE%/*}/../.."; pwd)"
 
 # opengl or vulkan
 TARGET=${TARGET:-opengl}
+TAG=${TAG:-ghcr.io/rectalogic/renderwindow:${UBUNTU:-noble}-$(git branch --show-current)}
 docker run ${DOCKER_OPTS} -e QSG_RHI_BACKEND=${TARGET} --rm --init \
-    --mount="type=bind,src=${MOUNT},dst=/renderwindow,consistency=cached" ghcr.io/rectalogic/renderwindow:${UBUNTU:-noble}-$(git branch --show-current) "$@"
+    --mount="type=bind,src=${MOUNT},dst=/renderwindow,consistency=cached" ${TAG} "$@"