Update nightly Rust images (rust-lang/docker-rust#175)

.github/workflows/nightly.yml

@@ -16,45 +16,45 @@ jobs:
       matrix:
         registry: ["ghcr.io", "docker.io", "quay.io"]
         os:
-          - alpine3.17
-          - alpine3.16
-          - bullseye
-          - bullseye-slim
+          - alpine3.19
+          - alpine3.18
           - bookworm
           - bookworm-slim
+          - bullseye
+          - bullseye-slim
           - buster
           - buster-slim
         include:
-          - os: alpine3.17
+          - os: alpine3.19
             tags: |
-              nightly-alpine3.17-<ver>
+              nightly-alpine3.19-<ver>
               nightly-alpine-<ver>
-              nightly-alpine3.17
+              nightly-alpine3.19
               nightly-alpine
-          - os: alpine3.16
-            tags: |
-              nightly-alpine3.16-<ver>
-              nightly-alpine3.16
-          - os: bullseye
-            tags: |
-              nightly-bullseye-<ver>
-              nightly-<ver>
-              nightly-bullseye
-              nightly
-          - os: bullseye-slim
+          - os: alpine3.18
             tags: |
-              nightly-bullseye-slim-<ver>
-              nightly-slim-<ver>
-              nightly-bullseye-slim
-              nightly-slim
+              nightly-alpine3.18-<ver>
+              nightly-alpine3.18
           - os: bookworm
             tags: |
               nightly-bookworm-<ver>
+              nightly-<ver>
               nightly-bookworm
+              nightly
           - os: bookworm-slim
             tags: |
               nightly-bookworm-slim-<ver>
+              nightly-slim-<ver>
               nightly-bookworm-slim
+              nightly-slim
+          - os: bullseye
+            tags: |
+              nightly-bullseye-<ver>
+              nightly-bullseye
+          - os: bullseye-slim
+            tags: |
+              nightly-bullseye-slim-<ver>
+              nightly-bullseye-slim
           - os: buster
             tags: |
               nightly-buster-<ver>

README.md

@@ -41,16 +41,16 @@ Mirrors [official `rust` Docker images][1].
 
 ### nightly
 
-Mirrors [official `ghcr.io/rust-lang/rust:nightly` Docker images][2], but preserves versions for each date.
+Mirrors [official `rust-lang/rust:nightly` Docker images][2], but preserves versions for each date.
 
-- [`nightly`, `nightly-$date`, `nightly-bullseye`, `nightly-bullseye-$date`][101]
-- [`nightly-slim`, `nightly-slim-$date`, `nightly-bullseye-slim`, `nightly-bullseye-slim-$date`][102]
-- [`nightly-bookworm`, `nightly-bookworm-$date`][101]
-- [`nightly-bookworm-slim`, `nightly-bookworm-slim-$date`][102]
-- [`nightly-buster`, `nightly-buster-$date`][101]
-- [`nightly-buster-slim`, `nightly-buster-slim-$date`][102]
-- [`nightly-alpine`, `nightly-alpine-$date`, `nightly-alpine3.17`, `nightly-alpine3.17-$date`][103]
-- [`nightly-alpine3.16`, `nightly-alpine3.16-$date`][103]
+- [`nightly`, `nightly-$date`, `nightly-bookworm`, `nightly-bookworm-$date`][101]
+- [`nightly-slim`, `nightly-slim-$date`, `nightly-bookworm-slim`, `nightly-bookworm-slim-$date`][102]
+- [`nightly-bullseye`, `nightly-bullseye-$date`][103]
+- [`nightly-bullseye-slim`, `nightly-bullseye-slim-$date`][104]
+- [`nightly-buster`, `nightly-buster-$date`][105]
+- [`nightly-buster-slim`, `nightly-buster-slim-$date`][106]
+- [`nightly-alpine`, `nightly-alpine-$date`, `nightly-alpine3.19`, `nightly-alpine3.19-$date`][107]
+- [`nightly-alpine3.18`, `nightly-alpine3.18-$date`][108]
 
 
 
@@ -161,7 +161,7 @@ If you have any problems with or questions about this image, please contact us t
 
 
 [1]: https://hub.docker.com/_/rust
-[2]: https://github.com/rust-lang/docker-rust-nightly/pkgs/container/rust
+[2]: https://hub.docker.com/r/rustlang/rust
 [3]: https://www.rust-lang.org/en-US/legal.html
 
 [11]: https://wiki.debian.org/DebianReleases
@@ -177,9 +177,14 @@ If you have any problems with or questions about this image, please contact us t
 [32]: https://github.com/instrumentisto/rust-docker-image/blob/main/LICENSE.md
 [33]: https://github.com/instrumentisto/rust-docker-image/issues
 
-[101]: https://github.com/rust-lang/docker-rust-nightly/blob/master/debian/Dockerfile
-[102]: https://github.com/rust-lang/docker-rust-nightly/blob/master/debian-slim/Dockerfile
-[103]: https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine/Dockerfile
+[101]: https://github.com/rust-lang/docker-rust/blob/master/nightly/bookworm/Dockerfile
+[102]: https://github.com/rust-lang/docker-rust/blob/master/nightly/bookworm/slim/Dockerfile
+[103]: https://github.com/rust-lang/docker-rust/blob/master/nightly/bullseye/Dockerfile
+[104]: https://github.com/rust-lang/docker-rust/blob/master/nightly/bullseye/slim/Dockerfile
+[105]: https://github.com/rust-lang/docker-rust/blob/master/nightly/buster/Dockerfile
+[106]: https://github.com/rust-lang/docker-rust/blob/master/nightly/buster/slim/Dockerfile
+[107]: https://github.com/rust-lang/docker-rust/blob/master/nightly/alpine3.19/Dockerfile
+[108]: https://github.com/rust-lang/docker-rust/blob/master/nightly/alpine3.18/Dockerfile
 
 [201]: https://github.com/instrumentisto/rust-docker-image/blob/main/beta/buster/Dockerfile
 [202]: https://github.com/instrumentisto/rust-docker-image/blob/main/beta/buster-slim/Dockerfile

nightly/check-changed.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 if [ -z "$IMAGE" ]; then
   echo "error: No IMAGE env var provided"
   exit 1
@@ -15,7 +14,7 @@ set -e
 
 
 upstream=$(skopeo inspect \
-                  --raw docker://ghcr.io/rust-lang/rust:nightly-$IMAGE_OS \
+                  --raw docker://docker.io/rustlang/rust:nightly-$IMAGE_OS \
            | jq -c '.')
 echo "--> Upstream image manifests: $upstream"
 

nightly/copy.sh

@@ -23,15 +23,15 @@ fi
 set -e
 
 runCmd \
-  podman pull ghcr.io/rust-lang/rust:nightly-$IMAGE_OS
+  podman pull docker.io/rustlang/rust:nightly-$IMAGE_OS
 
-ver=$(podman run --rm ghcr.io/rust-lang/rust:nightly-$IMAGE_OS rustc -V \
+ver=$(podman run --rm docker.io/rustlang/rust:nightly-$IMAGE_OS rustc -V \
       | cut -d ' ' -f4 \
       | tr -d "\n )")
 tags=$(printf "$IMAGE_TAGS" | sed "s/<ver>/$ver/g" | tr ',' "\n")
 
 for tag in $tags; do
   runCmd \
-    skopeo copy --all "docker://ghcr.io/rust-lang/rust:nightly-$IMAGE_OS" \
+    skopeo copy --all "docker://docker.io/rustlang/rust:nightly-$IMAGE_OS" \
                       "docker://$IMAGE:$tag"
 done