Skip to content

feat: add s390x and ppc64le support #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pacostas merged 1 commit into from
Jun 15, 2026
Merged

feat: add s390x and ppc64le support #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions buildpack_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ func testBuildpackIntegration(t *testing.T, context spec.G, it spec.S) {
[[targets]]
arch = "arm64"
os = "linux"

[[targets]]
arch = "s390x"
os = "linux"

[[targets]]
arch = "ppc64le"
os = "linux"
`,
stack.BuildImageID,
stack.RunImageID,
Expand Down
2 changes: 1 addition & 1 deletion images.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"support_usns": true,
"receipts_show_limit": 16,
"platforms": ["linux/amd64", "linux/arm64"],
"platforms": ["linux/amd64", "linux/arm64", "linux/s390x", "linux/ppc64le"],
"os_name": "ubuntu",
"os_codename": "jammy",
"repo_type": "stack",
Expand Down
40 changes: 33 additions & 7 deletions metadata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func testMetadata(t *testing.T, context spec.G, it spec.S) {
indexManifest, err := index.IndexManifest()
Expect(err).NotTo(HaveOccurred())

Expect(indexManifest.Manifests).To(HaveLen(2))
Expect(indexManifest.Manifests).To(HaveLen(4))

platforms := []v1.Platform{}
for _, manifest := range indexManifest.Manifests {
Expand All @@ -74,6 +74,14 @@ func testMetadata(t *testing.T, context spec.G, it spec.S) {
OS: "linux",
Architecture: "arm64",
}))
Expect(platforms).To(ContainElement(v1.Platform{
OS: "linux",
Architecture: "s390x",
}))
Expect(platforms).To(ContainElement(v1.Platform{
OS: "linux",
Architecture: "ppc64le",
}))

image, err := index.Image(indexManifest.Manifests[0].Digest)
Expect(err).NotTo(HaveOccurred())
Expand Down Expand Up @@ -155,7 +163,7 @@ func testMetadata(t *testing.T, context spec.G, it spec.S) {
indexManifest, err := index.IndexManifest()
Expect(err).NotTo(HaveOccurred())

Expect(indexManifest.Manifests).To(HaveLen(2))
Expect(indexManifest.Manifests).To(HaveLen(4))
platforms := []v1.Platform{}
for _, manifest := range indexManifest.Manifests {
platforms = append(platforms, v1.Platform{
Expand All @@ -171,6 +179,14 @@ func testMetadata(t *testing.T, context spec.G, it spec.S) {
OS: "linux",
Architecture: "arm64",
}))
Expect(platforms).To(ContainElement(v1.Platform{
OS: "linux",
Architecture: "s390x",
}))
Expect(platforms).To(ContainElement(v1.Platform{
OS: "linux",
Architecture: "ppc64le",
}))

image, err := index.Image(indexManifest.Manifests[0].Digest)
Expect(err).NotTo(HaveOccurred())
Expand Down Expand Up @@ -214,7 +230,9 @@ func testMetadata(t *testing.T, context spec.G, it spec.S) {
MatchRegexp("Version: [0-9]+ubuntu[0-9\\.]+"),
SatisfyAny(
ContainSubstring("Architecture: amd64"),
ContainSubstring("Architecture: arm64")),
ContainSubstring("Architecture: arm64"),
ContainSubstring("Architecture: s390x"),
ContainSubstring("Architecture: ppc64le")),
)))

Expect(image).To(HaveFileWithContent("/var/lib/dpkg/info/base-files.list", SatisfyAll(
Expand All @@ -240,7 +258,9 @@ func testMetadata(t *testing.T, context spec.G, it spec.S) {
MatchRegexp("Version: [0-9\\.\\-]+ubuntu[0-9\\.]+"),
SatisfyAny(
ContainSubstring("Architecture: amd64"),
ContainSubstring("Architecture: arm64")),
ContainSubstring("Architecture: arm64"),
ContainSubstring("Architecture: s390x"),
ContainSubstring("Architecture: ppc64le")),
)))

Expect(image).To(HaveFileWithContent("/var/lib/dpkg/info/libc6.list", SatisfyAll(
Expand All @@ -254,7 +274,9 @@ func testMetadata(t *testing.T, context spec.G, it spec.S) {
MatchRegexp("Version: [0-9\\.\\-]+ubuntu[0-9\\.]+"),
SatisfyAny(
ContainSubstring("Architecture: amd64"),
ContainSubstring("Architecture: arm64")),
ContainSubstring("Architecture: arm64"),
ContainSubstring("Architecture: s390x"),
ContainSubstring("Architecture: ppc64le")),
)))

Expect(image).To(HaveFileWithContent("/var/lib/dpkg/info/libssl3.list", SatisfyAll(
Expand All @@ -280,7 +302,9 @@ func testMetadata(t *testing.T, context spec.G, it spec.S) {
MatchRegexp("Version: [0-9\\.\\-]+ubuntu[0-9\\.]+"),
SatisfyAny(
ContainSubstring("Architecture: amd64"),
ContainSubstring("Architecture: arm64")),
ContainSubstring("Architecture: arm64"),
ContainSubstring("Architecture: s390x"),
ContainSubstring("Architecture: ppc64le")),
)))

Expect(image).To(HaveFileWithContent("/var/lib/dpkg/info/openssl.list", SatisfyAll(
Expand All @@ -306,7 +330,9 @@ func testMetadata(t *testing.T, context spec.G, it spec.S) {
MatchRegexp("Version: [a-z0-9\\.\\-\\:]+ubuntu[0-9\\.]+"),
SatisfyAny(
ContainSubstring("Architecture: amd64"),
ContainSubstring("Architecture: arm64")),
ContainSubstring("Architecture: arm64"),
ContainSubstring("Architecture: s390x"),
ContainSubstring("Architecture: ppc64le")),
)))

Expect(image).To(HaveFileWithContent("/var/lib/dpkg/info/zlib1g.list", SatisfyAll(
Expand Down
38 changes: 37 additions & 1 deletion stack/stack.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ id = "io.buildpacks.stacks.jammy.tiny"
homepage = "https://github.com/paketo-buildpacks/jammy-tiny-stack"
maintainer = "Paketo Buildpacks"

platforms = ["linux/amd64", "linux/arm64"]
platforms = ["linux/amd64", "linux/arm64", "linux/s390x", "linux/ppc64le"]

[build]
description = "ubuntu:jammy with compilers and shell utilities"
Expand Down Expand Up @@ -47,6 +47,24 @@ platforms = ["linux/amd64", "linux/arm64"]
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main universe multiverse
"""

[build.platforms."linux/s390x".args]
architecture = "s390x"

sources = """
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main universe multiverse
"""

[build.platforms."linux/ppc64le".args]
architecture = "ppc64le"

sources = """
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main universe multiverse
"""

[run]
description = "distroless-like jammy"
dockerfile = "./run/run.Dockerfile"
Expand Down Expand Up @@ -78,3 +96,21 @@ platforms = ["linux/amd64", "linux/arm64"]
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main universe multiverse
"""

[run.platforms."linux/s390x".args]
architecture = "s390x"

sources = """
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main universe multiverse
"""

[run.platforms."linux/ppc64le".args]
architecture = "ppc64le"

sources = """
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main universe multiverse
"""
Loading