Skip to content

Commit 6c38b46

Browse files
committed
Updates Debian base image to Trixie
1 parent 825351f commit 6c38b46

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

.github/actions/build-and-tag-locally/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ runs:
5757
linux/i386)
5858
plaform_name="i386"
5959
;;
60-
linux/mips64le)
61-
plaform_name="mips64le"
60+
linux/riscv64)
61+
plaform_name="riscv64"
6262
;;
6363
linux/ppc64le)
6464
plaform_name="ppc64le"

.github/workflows/pre-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
- linux/arm/v5
3737
- linux/arm/v6
3838
- linux/arm/v7
39-
- linux/mips64le
39+
- linux/riscv64
4040
- linux/ppc64le
4141
- linux/s390x
4242
- linux/arm64
4343
- linux/riscv64
4444
exclude:
4545
- distribution: alpine
46-
platform: linux/mips64le
46+
platform: linux/riscv64
4747
- distribution: alpine
4848
platform: linux/arm/v5
4949
- distribution: debian

debian/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release-automation/src/stackbrew_generator/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,12 @@ class StackbrewEntry(BaseModel):
215215
def architectures(self) -> List[str]:
216216
"""Get supported architectures based on distribution type."""
217217
if self.distribution.type == DistroType.DEBIAN:
218-
return ["amd64", "arm32v5", "arm32v7", "arm64v8", "i386", "mips64le", "ppc64le", "s390x"]
218+
return ["amd64", "arm32v5", "arm32v7", "arm64v8", "i386", "riscv64", "ppc64le", "s390x"]
219219
elif self.distribution.type == DistroType.ALPINE:
220220
return ["amd64", "arm32v6", "arm32v7", "arm64v8", "i386", "ppc64le", "riscv64", "s390x"]
221221
else:
222222
# Fallback to debian architectures for unknown distributions
223-
return ["amd64", "arm32v5", "arm32v7", "arm64v8", "i386", "mips64le", "ppc64le", "s390x"]
223+
return ["amd64", "arm32v5", "arm32v7", "arm64v8", "i386", "riscv64", "ppc64le", "s390x"]
224224

225225
def __str__(self) -> str:
226226
"""String representation in stackbrew format."""

release-automation/tests/test_models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ def test_debian_architectures(self):
261261
git_fetch_ref="refs/tags/v8.2.1"
262262
)
263263

264-
expected_architectures = ["amd64", "arm32v5", "arm32v7", "arm64v8", "i386", "mips64le", "ppc64le", "s390x"]
264+
expected_architectures = ["amd64", "arm32v5", "arm32v7", "arm64v8", "i386", "riscv64", "ppc64le", "s390x"]
265265
assert entry.architectures == expected_architectures
266266

267267
def test_alpine_architectures(self):

release-automation/tests/test_stackbrew_updater.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_update_stackbrew_content_basic(self):
2222
GitRepo: https://github.com/redis/docker-library-redis.git
2323
2424
Tags: 8.2.1, 8.2, 8, 8.2.1-bookworm, 8.2-bookworm, 8-bookworm, latest, bookworm
25-
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
25+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, riscv64, ppc64le, s390x
2626
GitCommit: old123commit
2727
GitFetch: refs/tags/v8.2.1
2828
Directory: debian
@@ -34,14 +34,14 @@ def test_update_stackbrew_content_basic(self):
3434
Directory: alpine
3535
3636
Tags: 7.4.0, 7.4, 7, 7.4.0-bookworm, 7.4-bookworm, 7-bookworm
37-
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
37+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, riscv64, ppc64le, s390x
3838
GitCommit: old456commit
3939
GitFetch: refs/tags/v7.4.0
4040
Directory: debian
4141
"""
4242

4343
new_content = """Tags: 8.2.2, 8.2, 8, 8.2.2-bookworm, 8.2-bookworm, 8-bookworm, latest, bookworm
44-
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
44+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, riscv64, ppc64le, s390x
4545
GitCommit: new123commit
4646
GitFetch: refs/tags/v8.2.2
4747
Directory: debian

release-automation/tests/test_update_stackbrew_file.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ def test_update_stackbrew_file_basic(self):
2828
GitRepo: https://github.com/redis/docker-library-redis.git
2929
3030
Tags: 8.2.1, 8.2, 8, 8.2.1-bookworm, 8.2-bookworm, 8-bookworm, latest, bookworm
31-
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
31+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, riscv64, ppc64le, s390x
3232
GitCommit: old123commit
3333
GitFetch: refs/tags/v8.2.1
3434
Directory: debian
3535
3636
Tags: 8.2.1-alpine, 8.2-alpine, 8-alpine, 8.2.1-alpine3.22, 8.2-alpine3.22, 8-alpine3.22, alpine, alpine3.22
37-
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
37+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, riscv64, ppc64le, s390x
3838
GitCommit: old123commit
3939
GitFetch: refs/tags/v8.2.1
4040
Directory: alpine
4141
4242
Tags: 7.4.0, 7.4, 7, 7.4.0-bookworm, 7.4-bookworm, 7-bookworm
43-
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
43+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, riscv64, ppc64le, s390x
4444
GitCommit: old456commit
4545
GitFetch: refs/tags/v7.4.0
4646
Directory: debian

0 commit comments

Comments
 (0)