Skip to content

Commit eaf6393

Browse files
author
Release Manager
committed
gh-35080: Use the Docker images published on ghcr.io without 'docker' in the name <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> ### 📚 Description <!-- Describe your changes here in detail --> Step 2 of the rename done in #35079. <!-- Why is this change required? What problem does it solve? --> Step 2 make sure that multi-stage workflows and devcontainers use the most current image, not the last image before the migration. The "build" and "build-doc" workflows will be updated in a 3rd (and final) step. <!-- If it resolves an open issue, please link to the issue here. For example "Closes #1337" --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [x] I have made sure that the title is self-explanatory and the description concisely explains the PR. - [ ] I have linked an issue or discussion. - [ ] I have created tests covering the changes. - [x] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open pull requests that this PR logically depends on --> <!-- - #xyz: short description why this is a dependency - #abc: ... --> This should only be merged when the images with the new names have been pushed. URL: #35080 Reported by: Matthias Köppe Reviewer(s): Dima Pasechnik
2 parents ce41bee + 4f0e53d commit eaf6393

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.devcontainer/portability-Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ ARG SYSTEM_FACTOR="ubuntu-jammy"
55
ARG PACKAGE_FACTOR="standard"
66
ARG DOCKER_TARGET="with-system-packages"
77
ARG DOCKER_TAG="dev"
8-
FROM ghcr.io/sagemath/sage/sage-docker-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}
8+
FROM ghcr.io/sagemath/sage/sage-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}

src/doc/en/developer/portability_testing.rst

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ packages instead of all of Sage, for example::
651651
[mkoeppe@sage sage]$ tox -e docker-centos-8-standard -- ratpoints
652652

653653
If the build succeeds, this will create a new image named
654-
``sage-docker-centos-8-standard-with-targets:9.1.beta9-431-gca4b5b2f33-dirty``,
654+
``sage-centos-8-standard-with-targets:9.1.beta9-431-gca4b5b2f33-dirty``,
655655
where
656656

657657
- the image name is derived from the tox environment name and the
@@ -676,22 +676,22 @@ the one just after running the ``configure`` script (``configured``)::
676676
Step 109/109 : RUN yum install -y zlib-devel || echo "(ignoring error)"
677677
...
678678
Successfully built 4bb14c3d5646
679-
Successfully tagged sage-docker-centos-8-standard-with-system-packages:9.1.beta9-435-g861ba33bbc-dirty
679+
Successfully tagged sage-centos-8-standard-with-system-packages:9.1.beta9-435-g861ba33bbc-dirty
680680
Sending build context to Docker daemon ...
681681
...
682-
Successfully tagged sage-docker-centos-8-standard-configured:9.1.beta9-435-g861ba33bbc-dirty
682+
Successfully tagged sage-centos-8-standard-configured:9.1.beta9-435-g861ba33bbc-dirty
683683
...
684684
Sending build context to Docker daemon ...
685685
...
686-
Successfully tagged sage-docker-centos-8-standard-with-targets:9.1.beta9-435-g861ba33bbc-dirty
686+
Successfully tagged sage-centos-8-standard-with-targets:9.1.beta9-435-g861ba33bbc-dirty
687687

688688
Let's verify that the images are available::
689689

690690
(base) egret:~/s/sage/sage-rebasing/worktree-algebraic-2018-spring (mkoeppe *$%>)$ docker images | head
691691
REPOSITORY TAG IMAGE ID
692-
sage-docker-centos-8-standard-with-targets 9.1.beta9-435-g861ba33bbc-dirty 7ecfa86fceab
693-
sage-docker-centos-8-standard-configured 9.1.beta9-435-g861ba33bbc-dirty 4314929e2b4c
694-
sage-docker-centos-8-standard-with-system-packages 9.1.beta9-435-g861ba33bbc-dirty 4bb14c3d5646
692+
sage-centos-8-standard-with-targets 9.1.beta9-435-g861ba33bbc-dirty 7ecfa86fceab
693+
sage-centos-8-standard-configured 9.1.beta9-435-g861ba33bbc-dirty 4314929e2b4c
694+
sage-centos-8-standard-with-system-packages 9.1.beta9-435-g861ba33bbc-dirty 4bb14c3d5646
695695
...
696696

697697

@@ -1082,8 +1082,8 @@ where you replace the token by your token, of course, and
10821082

10831083
Now you can pull the image and run it::
10841084

1085-
$ docker pull ghcr.io/YOUR-GITHUB-USERNAME/sage/sage-docker-fedora-31-standard-configured:f4bd671
1086-
$ docker run -it ghcr.io/YOUR-GITHUB-USERNAME/sage/sage-docker-fedora-31-standard-configured:f4bd671 bash
1085+
$ docker pull ghcr.io/YOUR-GITHUB-USERNAME/sage/sage-fedora-31-standard-configured:f4bd671
1086+
$ docker run -it ghcr.io/YOUR-GITHUB-USERNAME/sage/sage-fedora-31-standard-configured:f4bd671 bash
10871087

10881088

10891089
Using our pre-built Docker images published on ghcr.io
@@ -1101,19 +1101,19 @@ the build logs for a given platform.
11011101
The image version corresponding to the latest development release
11021102
receives the additional Docker tag ``dev``, see for example the Docker
11031103
image for the platform `ubuntu-focal-standard
1104-
<https://github.com/sagemath/sage/pkgs/container/sage%2Fsage-docker-ubuntu-focal-standard-with-targets-optional>`_. Thus,
1104+
<https://github.com/sagemath/sage/pkgs/container/sage%2Fsage-ubuntu-focal-standard-with-targets-optional>`_. Thus,
11051105
for example, the following command will work::
11061106

1107-
$ docker run -it ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets-optional:dev bash
1108-
Unable to find image 'ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets-optional:dev' locally
1109-
dev: Pulling from sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets-optional
1107+
$ docker run -it ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets-optional:dev bash
1108+
Unable to find image 'ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets-optional:dev' locally
1109+
dev: Pulling from sagemath/sage/sage-ubuntu-focal-standard-with-targets-optional
11101110
d5fd17ec1767: Already exists
11111111
67586203f0c7: Pull complete
11121112
b63c529f4777: Pull complete
11131113
...
11141114
159775d1a3d2: Pull complete
11151115
Digest: sha256:e6ba5e12f59c6c4668692ef4cfe4ae5f242556482664fb347bf260f32bf8e698
1116-
Status: Downloaded newer image for ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets-optional:dev
1116+
Status: Downloaded newer image for ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets-optional:dev
11171117
root@8055a7ba0607:/sage# ./sage
11181118
┌────────────────────────────────────────────────────────────────────┐
11191119
│ SageMath version 9.6, Release Date: 2022-05-15 │
@@ -1127,7 +1127,7 @@ contain a copy of the source tree and the full logs of the build and
11271127
test.
11281128

11291129
Also `smaller images corresponding to earlier build stages
1130-
<https://github.com/orgs/sagemath/packages?tab=packages&q=sage-docker-debian-bullseye-standard>`_
1130+
<https://github.com/orgs/sagemath/packages?tab=packages&q=sage-debian-bullseye-standard>`_
11311131
are available:
11321132

11331133
* ``-with-system-packages`` provides a system installation with

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ setenv =
462462
# Resulting full image:tag name
463463
#
464464
docker: FULL_BASE_IMAGE_AND_TAG={env:ARCH_IMAGE_PREFIX:}{env:BASE_IMAGE}{env:ARCH_IMAGE_SUFFIX:}:{env:ARCH_TAG_PREFIX:}{env:BASE_TAG}{env:ARCH_TAG_SUFFIX:}
465-
docker-incremental: FULL_BASE_IMAGE_AND_TAG={env:FROM_DOCKER_REPOSITORY:ghcr.io/sagemath/sage/}sage-$(echo {envname} | sed 's/-incremental//')-{env:FROM_DOCKER_TARGET:with-targets}:{env:FROM_DOCKER_TAG:dev}
465+
docker-incremental: FULL_BASE_IMAGE_AND_TAG={env:FROM_DOCKER_REPOSITORY:ghcr.io/sagemath/sage/}sage-$(echo {envname} | sed -E "s/(docker-|-incremental)//g")-{env:FROM_DOCKER_TARGET:with-targets}:{env:FROM_DOCKER_TAG:dev}
466466
docker-incremental: SKIP_SYSTEM_PKG_INSTALL=yes
467467
#
468468
docker-nobootstrap: BOOTSTRAP=./bootstrap -D

0 commit comments

Comments
 (0)