Merge pull request #202 from paolobarbolini/alpine-3.20

Muscraft · web-flow · commit f9f78b7625cc · 2024-05-23T11:27:05.000-06:00
Add Alpine 3.20 variant
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,10 +36,10 @@ jobs:
             variant: bookworm
           - name: slim-bookworm
             variant: bookworm/slim
-          - name: alpine3.18
-            variant: alpine3.18
           - name: alpine3.19
             variant: alpine3.19
+          - name: alpine3.20
+            variant: alpine3.20
 #VERSIONS
     name: ${{ matrix.name }}
     steps:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -53,16 +53,16 @@ jobs:
             tags: |
               nightly-bookworm-slim
               nightly-slim
-          - name: alpine3.18
-            context: nightly/alpine3.18
-            platforms: linux/amd64,linux/arm64
-            tags: |
-              nightly-alpine3.18
           - name: alpine3.19
             context: nightly/alpine3.19
             platforms: linux/amd64,linux/arm64
             tags: |
               nightly-alpine3.19
+          - name: alpine3.20
+            context: nightly/alpine3.20
+            platforms: linux/amd64,linux/arm64
+            tags: |
+              nightly-alpine3.20
               nightly-alpine
 #VERSIONS
     name: ${{ matrix.name }}
diff --git a/1.78.0/alpine3.20/Dockerfile b/1.78.0/alpine3.20/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.20
 
 LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
 
diff --git a/nightly/alpine3.20/Dockerfile b/nightly/alpine3.20/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.20
 
 LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
 
diff --git a/x.py b/x.py
@@ -40,11 +40,11 @@
 ]
 
 alpine_versions = [
-    "3.18",
     "3.19",
+    "3.20",
 ]
 
-default_alpine_version = "3.19"
+default_alpine_version = "3.20"
 
 def rustup_hash(arch):
     url = f"https://static.rust-lang.org/rustup/archive/{rustup_version}/{arch}/rustup-init.sha256"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.18`
	`1`	`+FROM alpine:3.20`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@`
`40`	`40`	`]`
`41`	`41`
`42`	`42`	`alpine_versions = [`
`43`		`- "3.18",`
`44`	`43`	`"3.19",`
	`44`	`+ "3.20",`
`45`	`45`	`]`
`46`	`46`
`47`		`-default_alpine_version = "3.19"`
	`47`	`+default_alpine_version = "3.20"`
`48`	`48`
`49`	`49`	`def rustup_hash(arch):`
`50`	`50`	`url = f"https://static.rust-lang.org/rustup/archive/{rustup_version}/{arch}/rustup-init.sha256"`