Skip to content

Commit fab440a

Browse files
authored
Merge pull request #221 from paolobarbolini/alpine-3.21
Add Alpine 3.21 variant and drop Alpine 3.19
2 parents 611e4d3 + 85c88f3 commit fab440a

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Diff for: .github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
variant: bookworm
3333
- name: slim-bookworm
3434
variant: bookworm/slim
35-
- name: alpine3.19
36-
variant: alpine3.19
3735
- name: alpine3.20
3836
variant: alpine3.20
37+
- name: alpine3.21
38+
variant: alpine3.21
3939
#VERSIONS
4040
name: ${{ matrix.name }}
4141
steps:

Diff for: .github/workflows/nightly.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ jobs:
4343
tags: |
4444
nightly-bookworm-slim
4545
nightly-slim
46-
- name: alpine3.19
47-
context: nightly/alpine3.19
48-
platforms: linux/amd64,linux/arm64
49-
tags: |
50-
nightly-alpine3.19
5146
- name: alpine3.20
5247
context: nightly/alpine3.20
5348
platforms: linux/amd64,linux/arm64
5449
tags: |
5550
nightly-alpine3.20
51+
- name: alpine3.21
52+
context: nightly/alpine3.21
53+
platforms: linux/amd64,linux/arm64
54+
tags: |
55+
nightly-alpine3.21
5656
nightly-alpine
5757
#VERSIONS
5858
name: ${{ matrix.name }}

Diff for: nightly/alpine3.19/Dockerfile renamed to nightly/alpine3.21/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.19
1+
FROM alpine:3.21
22

33
LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
44

Diff for: stable/alpine3.19/Dockerfile renamed to stable/alpine3.21/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.19
1+
FROM alpine:3.21
22

33
LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
44

Diff for: x.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
]
4848

4949
alpine_versions = [
50-
"3.19",
5150
"3.20",
51+
"3.21",
5252
]
5353

54-
default_alpine_version = "3.20"
54+
default_alpine_version = "3.21"
5555

5656
def rustup_hash(arch):
5757
url = f"https://static.rust-lang.org/rustup/archive/{rustup_version}/{arch}/rustup-init.sha256"

0 commit comments

Comments
 (0)