From 18f421034b807e159fb88e807be7bf7fc85ba877 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 11 Feb 2023 20:12:22 -0800 Subject: [PATCH 1/2] Remove 'docker' from the names of the Docker images published on ghcr.io --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 5eb3e79633b..72fbcefe294 100644 --- a/tox.ini +++ b/tox.ini @@ -647,7 +647,7 @@ 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_STEM=sage-$(echo {envname} | sed s/-incremental//); \ + docker: BUILD_IMAGE_STEM=sage-$(echo {envname} | sed "s/-docker//;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); \ From 118f756ddd5baff0974d46c9dc8192ae7e5a352c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 12 Feb 2023 15:36:22 -0800 Subject: [PATCH 2/2] tox.ini: Fix up --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 72fbcefe294..9ce8086648b 100644 --- a/tox.ini +++ b/tox.ini @@ -647,7 +647,7 @@ 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_STEM=sage-$(echo {envname} | sed "s/-docker//;s/-incremental//"); \ + docker: BUILD_IMAGE_STEM=sage-$(echo {envname} | sed "s/docker-//;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); \