tox.ini (docker-incremental): Do not include '-incremental' in the Do…

…cker image name
sagemath · Jul 28, 2022 · ae269d1 · ae269d1
1 parent a07874d
commit ae269d1
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/tox.ini b/tox.ini
@@ -636,9 +636,10 @@ commands =
     docker-{arm64,armhf}:  docker run --rm --privileged multiarch/qemu-user-static:register --reset
     docker:        bash -c 'if [ x"{env:DOCKER_CONFIG_FILE:}" != x ]; then mkdir -p {envdir}/.docker && ln -sf $(realpath "{env:DOCKER_CONFIG_FILE:}") {envdir}/.docker/; fi'
     docker:        bash -c 'for docker_target in {env:DOCKER_TARGETS:with-targets}; do \
-    docker:            BUILD_IMAGE={env:DOCKER_PUSH_REPOSITORY:}sage-{envname}-$docker_target; \
-    docker:            BUILD_TAG=$BUILD_IMAGE:$(git describe --dirty --always); \
-    docker:            TAG_ARGS=$(echo --tag $BUILD_TAG; for tag in {env:EXTRA_DOCKER_TAGS:}; do echo --tag $BUILD_IMAGE:$tag; done); \
+    docker:            BUILD_IMAGE_STEM=sage-$(echo {envname} | sed s/-incremental//); \
+    docker:            BUILD_IMAGE=$DOCKER_PUSH_REPOSITORY$BUILD_IMAGE_STEM-$docker_target; \
+    docker:            BUILD_TAG=$(git describe --dirty --always); \
+    docker:            TAG_ARGS=$(for tag in $BUILD_TAG {env:EXTRA_DOCKER_TAGS:}; do echo --tag $BUILD_IMAGE:$tag; done); \
     docker:            DOCKER_BUILDKIT={env:DOCKER_BUILDKIT:0} \
     docker:            docker build . -f {envdir}/Dockerfile \
     docker:              --target $docker_target \
@@ -652,11 +653,11 @@ commands =
     docker:              --build-arg TARGETS_OPTIONAL="{env:TARGETS_OPTIONAL:ptest}" \
     docker:              {env:EXTRA_DOCKER_BUILD_ARGS:}; status=$?; \
     docker:            if [ $status != 0 ]; then \
-    docker:              BUILD_TAG="$BUILD_TAG-failed"; docker commit $(docker ps -l -q) $BUILD_TAG; PUSH_TAGS=$BUILD_TAG; \
+    docker:              BUILD_TAG="$BUILD_TAG-failed"; docker commit $(docker ps -l -q) $BUILD_IMAGE:$BUILD_TAG; PUSH_TAGS=$BUILD_IMAGE:$BUILD_TAG; \
     docker:            else \
-    docker:              PUSH_TAGS=$(echo $BUILD_TAG; for tag in {env:EXTRA_DOCKER_TAGS:}; do echo "$BUILD_IMAGE:$tag"; done); \
+    docker:              PUSH_TAGS=$(echo $BUILD_IMAGE:$BUILD_TAG; for tag in {env:EXTRA_DOCKER_TAGS:}; do echo "$BUILD_IMAGE:$tag"; done); \
     docker:            fi; \
-    docker:            echo $BUILD_TAG >> {envdir}/Dockertags; \
+    docker:            echo $BUILD_IMAGE:$BUILD_TAG >> {envdir}/Dockertags; \
     docker:            if [ x"{env:DOCKER_PUSH_REPOSITORY:}" != x ]; then \
     docker:              echo Pushing $PUSH_TAGS; \
     docker:              for tag in $PUSH_TAGS; do \