Skip to content

[pull] main from containerd:main #296

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
pull merged 2 commits into from
Apr 6, 2026
Merged

[pull] main from containerd:main #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72919fb
integration/images: add s390x builds for volume test images
tao12345666333 Apr 6, 2026
9b9e505
Merge pull request #13166 from tao12345666333/add-s390x-volume-test-i…
estesp Apr 6, 2026
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
5 changes: 3 additions & 2 deletions integration/images/volume-copy-up/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ endif

# Operating systems supported: linux, windows
OS ?= linux
# Architectures supported: amd64, arm64
# Architectures supported: amd64, arm64, ppc64le, s390x
ARCH ?= amd64
# OS Version for the Windows images: 1809, 20H2, ltsc2022
OSVERSION ?= 1809
Expand All @@ -41,7 +41,7 @@ OSVERSION ?= 1809
OUTPUT_TYPE ?= docker

ALL_OS = linux
ALL_ARCH.linux = amd64 arm64 ppc64le
ALL_ARCH.linux = amd64 arm64 ppc64le s390x
ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))

ifneq ($(REMOTE_DOCKER_URL),)
Expand All @@ -54,6 +54,7 @@ endif
BASE.linux.amd64 := busybox
BASE.linux.arm64 := arm64v8/busybox
BASE.linux.ppc64le := busybox
BASE.linux.s390x := busybox
BASE.linux := ${BASE.linux.${ARCH}}
BASE := ${BASE.${OS}}

Expand Down
5 changes: 3 additions & 2 deletions integration/images/volume-ownership/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ endif

# Operating systems supported: linux, windows
OS ?= linux
# Architectures supported: amd64, arm64
# Architectures supported: amd64, arm64, ppc64le, s390x
ARCH ?= amd64
# OS Version for the Windows images: 1809, 20H2, ltsc2022
OSVERSION ?= 1809
Expand All @@ -41,7 +41,7 @@ OSVERSION ?= 1809
OUTPUT_TYPE ?= docker

ALL_OS = linux
ALL_ARCH.linux = amd64 arm64 ppc64le
ALL_ARCH.linux = amd64 arm64 ppc64le s390x
ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))

ifneq ($(REMOTE_DOCKER_URL),)
Expand All @@ -54,6 +54,7 @@ endif
BASE.linux.amd64 := busybox
BASE.linux.arm64 := arm64v8/busybox
BASE.linux.ppc64le := busybox
BASE.linux.s390x := busybox
BASE.linux := ${BASE.linux.${ARCH}}
BASE := ${BASE.${OS}}

Expand Down
Loading