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

[release/1.7] Prepare v1.7.5 #2885

Merged
merged 9 commits into from
Mar 16, 2024
Merged

[release/1.7] Prepare v1.7.5 #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d9fc050
build(deps): bump github.com/go-jose/go-jose/v3 from 3.0.1 to 3.0.3
dependabot[bot] Mar 7, 2024
e176910
build(deps): bump github.com/containerd/containerd from 1.7.13 to 1.7.14
dependabot[bot] Mar 11, 2024
4d51020
update containerd (1.7.14),(1.6.30)
yankay Mar 12, 2024
7b7d695
update slirp4netns (1.2.3)
AkihiroSuda Feb 6, 2024
4149ca4
update CNI plugins (1.4.1)
AkihiroSuda Mar 13, 2024
0a0f442
update RootlessKit (2.0.2)
AkihiroSuda Mar 13, 2024
a004f9a
update Kubo (0.27.0)
AkihiroSuda Mar 13, 2024
0d59373
build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0
dependabot[bot] Mar 14, 2024
abd9784
update imgcrypt (1.1.10)
AkihiroSuda Mar 14, 2024
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
32 changes: 16 additions & 16 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ jobs:
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
include:
- ubuntu: 20.04
containerd: v1.6.28
containerd: v1.6.30
- ubuntu: 20.04
containerd: v1.7.13
containerd: v1.7.14
- ubuntu: 22.04
containerd: v1.7.13
containerd: v1.7.14
- 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.13
containerd: v1.7.14
env:
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
CONTAINERD_VERSION: "${{ matrix.containerd }}"
Expand Down Expand Up @@ -157,36 +157,36 @@ jobs:
# ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
include:
- ubuntu: 20.04
containerd: v1.6.28
containerd: v1.6.30
rootlesskit: v1.1.1
target: test-integration-rootless
- ubuntu: 20.04
containerd: v1.7.13
rootlesskit: v2.0.1
containerd: v1.7.14
rootlesskit: v2.0.2
target: test-integration-rootless
- ubuntu: 22.04
containerd: v1.7.13
containerd: v1.7.14
rootlesskit: v1.1.1
target: test-integration-rootless
- ubuntu: 22.04
containerd: main
rootlesskit: v2.0.1
rootlesskit: v2.0.2
target: test-integration-rootless
- ubuntu: 20.04
containerd: v1.6.28
containerd: v1.6.30
rootlesskit: v1.1.1
target: test-integration-rootless-port-slirp4netns
- ubuntu: 20.04
containerd: v1.7.13
rootlesskit: v2.0.1
containerd: v1.7.14
rootlesskit: v2.0.2
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
containerd: v1.7.13
containerd: v1.7.14
rootlesskit: v1.1.1
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
containerd: main
rootlesskit: v2.0.1
rootlesskit: v2.0.2
target: test-integration-rootless-port-slirp4netns
env:
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
Expand Down Expand Up @@ -276,15 +276,15 @@ jobs:
- uses: actions/[email protected]
with:
repository: containerd/containerd
ref: v1.7.13
ref: v1.7.14
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.13
ctrdVersion: 1.7.14
run: powershell hack/configure-windows-ci.ps1
# TODO: Run unit tests
- name: "Run integration tests"
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,26 @@
# TODO: verify commit hash

# Basic deps
ARG CONTAINERD_VERSION=v1.7.13
ARG CONTAINERD_VERSION=v1.7.14
ARG RUNC_VERSION=v1.1.12
ARG CNI_PLUGINS_VERSION=v1.4.0
ARG CNI_PLUGINS_VERSION=v1.4.1

# Extra deps: Build
ARG BUILDKIT_VERSION=v0.12.5
# Extra deps: Lazy-pulling
ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1
# Extra deps: Encryption
ARG IMGCRYPT_VERSION=v1.1.9
ARG IMGCRYPT_VERSION=v1.1.10
# Extra deps: Rootless
ARG ROOTLESSKIT_VERSION=v2.0.1
ARG SLIRP4NETNS_VERSION=v1.2.2
ARG ROOTLESSKIT_VERSION=v2.0.2
ARG SLIRP4NETNS_VERSION=v1.2.3
# Extra deps: bypass4netns
ARG BYPASS4NETNS_VERSION=v0.4.0
# Extra deps: FUSE-OverlayFS
ARG FUSE_OVERLAYFS_VERSION=v1.13
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8
# Extra deps: IPFS
ARG KUBO_VERSION=v0.26.0
ARG KUBO_VERSION=v0.27.0
# Extra deps: Init
ARG TINI_VERSION=v0.19.0
# Extra deps: Debug
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.0
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1511f6c003ace805eafeb1132727791326283cff88a923d76329e1892bba7a10 cni-plugins-linux-amd64-v1.4.1.tgz
72644e13557cda8a5b39baf97fc5e93d23fdf7baba7700000e7e9efd8bdf9234 cni-plugins-linux-arm64-v1.4.1.tgz
6 changes: 0 additions & 6 deletions Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.1
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
4dafc86e1cbee2fbedac6822bf46e459d54ec998803d273f535b67a6e62edb30 rootlesskit-aarch64.tar.gz
c633c5e7f84d3390c4ebe8102af0cd8bdecd1f10e9fc007036636ef94d95b449 rootlesskit-armv7l.tar.gz
598a2c685cd383ba1abd3bf20a5c1bd55c283ceea1b3a9479c76f0fb96df75d5 rootlesskit-ppc64le.tar.gz
af9bbb79de33b0b3f901b3848341ae4b05ca4e0838f103044f082aab91f3b7f5 rootlesskit-riscv64.tar.gz
b1539a7f8059150f8dfdfc4de3a2714a199c09fdfe9c7670ce69824b8fdad7b9 rootlesskit-s390x.tar.gz
a218beb65d243183d13024a8b18fc08543e238ef38d306166e8375bde0efd57c rootlesskit-x86_64.tar.gz
7 changes: 0 additions & 7 deletions Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.2.2
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
5ccf6a6cabc312d33332709486ea90110f4608b8371954d6dc2a1ed865457f92 SOURCE_DATE_EPOCH
289b0838f849da0d6d5de596e6c5010fbb134a2912d3cc32a0e2e2b759543278 slirp4netns-aarch64
43db5430758edb8d095a0923dcbf2757a2fded9f22aa851d18aad9b82c245fb6 slirp4netns-armv7l
fe565401ffefa1c4f1e6c141788405825ae5513e0bb1122bdfe6acdd00be9e71 slirp4netns-ppc64le
cb9f92d496541b9ee2163bd64d522bf82a4136ccbbb01e3883be078a5e65af6f slirp4netns-riscv64
09e68bd9707fdab67884256bea5ca09ae9057a4ebf3f8382e369602c7ae21734 slirp4netns-s390x
2051ae25baba59c96f42bf2b7b7efa2eabb022e497b6c4b692b1428d2b2d1f5b slirp4netns-x86_64
18 changes: 9 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/containerd/nerdctl

go 1.20
go 1.21

require (
github.com/Masterminds/semver/v3 v3.2.1
Expand All @@ -10,8 +10,8 @@ require (
github.com/compose-spec/compose-go v1.20.2
github.com/containerd/accelerated-container-image v1.0.2
github.com/containerd/cgroups/v3 v3.0.3
github.com/containerd/console v1.0.3
github.com/containerd/containerd v1.7.13
github.com/containerd/console v1.0.4
github.com/containerd/containerd v1.7.14
github.com/containerd/continuity v0.4.3
github.com/containerd/fifo v1.1.0
github.com/containerd/go-cni v1.1.9
Expand Down Expand Up @@ -54,11 +54,11 @@ require (
github.com/vishvananda/netns v0.0.4
github.com/yuchanns/srslog v1.1.0
go.uber.org/mock v0.4.0
golang.org/x/crypto v0.18.0
golang.org/x/crypto v0.19.0
golang.org/x/net v0.20.0
golang.org/x/sync v0.6.0
golang.org/x/sys v0.16.0
golang.org/x/term v0.16.0
golang.org/x/sys v0.17.0
golang.org/x/term v0.17.0
golang.org/x/text v0.14.0
gopkg.in/yaml.v3 v3.0.1
gotest.tools/v3 v3.5.1
Expand All @@ -74,15 +74,15 @@ require (
github.com/cilium/ebpf v0.11.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/go-runc v1.0.0 // indirect
github.com/containerd/ttrpc v1.2.2 // indirect
github.com/containerd/ttrpc v1.2.3 // indirect
github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 // indirect
github.com/containers/ocicrypt v1.1.9 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/djherbis/times v1.5.0 // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
Expand Down Expand Up @@ -139,6 +139,6 @@ require (
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
)
Loading
Loading