Skip to content
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

Jump to bottom

update containerd (1.7.9), Kubo (0.24.0) #2659

Merged
merged 3 commits into from
Nov 25, 2023
Merged

update containerd (1.7.9), Kubo (0.24.0) #2659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec72834
update containerd (1.7.9)
AkihiroSuda Nov 25, 2023
e080801
update Kubo (0.24.0)
AkihiroSuda Nov 25, 2023
aeeb338
update Nydus (2.2.4)
AkihiroSuda Nov 25, 2023
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
18 changes: 9 additions & 9 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ jobs:
- ubuntu: 20.04
containerd: v1.6.24
- ubuntu: 20.04
containerd: v1.7.8
containerd: v1.7.9
- ubuntu: 22.04
containerd: v1.7.8
containerd: v1.7.9
- ubuntu: 22.04
containerd: main
env:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
include:
- ubuntu: 22.04
containerd: v1.7.8
containerd: v1.7.9
env:
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
CONTAINERD_VERSION: "${{ matrix.containerd }}"
Expand Down Expand Up @@ -160,10 +160,10 @@ jobs:
containerd: v1.6.24
target: test-integration-rootless
- ubuntu: 20.04
containerd: v1.7.8
containerd: v1.7.9
target: test-integration-rootless
- ubuntu: 22.04
containerd: v1.7.8
containerd: v1.7.9
target: test-integration-rootless
- ubuntu: 22.04
containerd: main
Expand All @@ -172,10 +172,10 @@ jobs:
containerd: v1.6.24
target: test-integration-rootless-port-slirp4netns
- ubuntu: 20.04
containerd: v1.7.8
containerd: v1.7.9
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
containerd: v1.7.8
containerd: v1.7.9
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
containerd: main
Expand Down Expand Up @@ -267,15 +267,15 @@ jobs:
- uses: actions/checkout@v4.1.1
with:
repository: containerd/containerd
ref: v1.7.8
ref: v1.7.9
path: containerd
fetch-depth: 1
- name: "Set up CNI"
working-directory: containerd
run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
- name: "Set up containerd"
env:
ctrdVersion: 1.7.8
ctrdVersion: 1.7.9
run: powershell hack/configure-windows-ci.ps1
# TODO: Run unit tests
- name: "Run integration tests"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# TODO: verify commit hash

# Basic deps
ARG CONTAINERD_VERSION=v1.7.8
ARG CONTAINERD_VERSION=v1.7.9
ARG RUNC_VERSION=v1.1.10
ARG CNI_PLUGINS_VERSION=v1.3.0

Expand All @@ -37,7 +37,7 @@ ARG BYPASS4NETNS_VERSION=v0.3.0
ARG FUSE_OVERLAYFS_VERSION=v1.13
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8
# Extra deps: IPFS
ARG KUBO_VERSION=v0.23.0
ARG KUBO_VERSION=v0.24.0
# Extra deps: Init
ARG TINI_VERSION=v0.19.0
# Extra deps: Debug
Expand All @@ -48,7 +48,7 @@ ARG GO_VERSION=1.21
ARG UBUNTU_VERSION=22.04
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
ARG GOTESTSUM_VERSION=v1.11.0
ARG NYDUS_VERSION=v2.2.3
ARG NYDUS_VERSION=v2.2.4
ARG SOCI_SNAPSHOTTER_VERSION=0.4.0

FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.3.0 AS xx
Expand Down
Loading