Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
15320ab
v2.0.0-rc.4
Sep 4, 2024
bb06526
v2.0.0-rc.4
Sep 4, 2024
374183e
v2.0.0-rc.4
Sep 24, 2024
41d7d0d
v2.0.0-rc.4
Sep 24, 2024
678efa8
v2.0.0-rc.4
Sep 24, 2024
c737fe2
Merge tag 'v2.0.0-rc.5' into release-v2.0
Oct 11, 2024
c4247b3
v2.0.0-rc.5.beagle
Oct 11, 2024
ce36de3
update .beagle/dockerfile
Oct 11, 2024
c6c0381
v2.0.0-rc.5.beagle
Oct 11, 2024
4281568
v2.0.0-rc.5
Oct 11, 2024
3638956
update .beagle.yml
Oct 11, 2024
4e47e98
v2.0.0-rc.5
Oct 11, 2024
67e30be
update
Oct 11, 2024
1631c25
2.0.0-beagle-rc.5
Oct 11, 2024
6038c91
update .beagle/build-cross.sh
Oct 11, 2024
bff4030
add btrfs
Oct 26, 2024
f024b6f
v2.0.0-rc.6
Oct 26, 2024
27a3fbc
v2.0.0-rc.6
Oct 26, 2024
458215f
ci: enable marking 2.0 releases as latest
austinvazquez Nov 7, 2024
e99c2b5
Avoid arch info in the sed/replace when building cri-cni-containerd.t…
dims Nov 7, 2024
124b718
Merge pull request #10968 from dims/Avoid-arch-info-in-the-sed/replac…
mikebrow Nov 7, 2024
aedb61c
Merge pull request #10963 from austinvazquez/enable-latest-release-on…
mxpv Nov 7, 2024
5b879f3
update to go1.23.3 / go1.22.9
akhilerm Nov 7, 2024
e21cb92
Merge pull request #10973 from k8s-infra-cherrypick-robot/cherry-pick…
mxpv Nov 8, 2024
10996a3
fsverity_test.go: fix nil pointer dereference, fix test fail
xbt573 Nov 8, 2024
30b929e
fsverity_test.go: fix major/minor device number resolving
xbt573 Nov 8, 2024
2f44e98
Merge tag 'v2.0.0' into release-v2.0
Nov 11, 2024
73d1b2e
v2.0.0
Nov 11, 2024
389e781
build(deps): bump github.com/containerd/typeurl/v2 from 2.2.2 to 2.2.3
dependabot[bot] Nov 11, 2024
abd8c4c
Merge pull request #10997 from dmcgowan/backport-2.0-typeurl
estesp Nov 12, 2024
a7f2b56
fsverity_linux.go: Fix fsverity.IsEnabled() for big endian systems
xbt573 Nov 10, 2024
da51d8f
Merge pull request #11005 from k8s-infra-cherrypick-robot/cherry-pick…
fuweid Nov 14, 2024
6399c93
Revert "Disable vagrant strict dependency checking"
akhilerm Nov 14, 2024
30cbb03
Merge pull request #11009 from k8s-infra-cherrypick-robot/cherry-pick…
samuelkarp Nov 15, 2024
9081e97
update runc binary to 1.2.2
austinvazquez Nov 18, 2024
376eb1d
Merge pull request #11023 from austinvazquez/cherry-pick-runc-1.2.2-t…
AkihiroSuda Nov 19, 2024
78795fa
Merge pull request #10978 from austinvazquez/cherry-pick-pr-10972-to-2.0
fuweid Nov 19, 2024
9860888
fix: set the credentials even if not provided
smira Oct 29, 2024
6e51f71
Merge pull request #11031 from k8s-infra-cherrypick-robot/cherry-pick…
dmcgowan Nov 19, 2024
cf07f28
*: should align pipe's owner with init process
fuweid Oct 28, 2024
952ad6b
Merge pull request #11035 from k8s-infra-cherrypick-robot/cherry-pick…
fuweid Nov 20, 2024
7dec6b4
move rocky 9.4 to almalinux/9 in CI
djdongjin Nov 25, 2024
b4cab35
Merge pull request #11053 from djdongjin/rocky-ci-fix-2.0
dmcgowan Nov 25, 2024
34a45ca
Publish attestation as release artifact
austinvazquez Nov 24, 2024
73f57ac
Update differ to handle zstd media types
dmcgowan Nov 26, 2024
961cac9
Merge pull request #11067 from austinvazquez/cherry-pick-3961dc9c8cb0…
dmcgowan Nov 27, 2024
3ba2df9
fix panic due to nil dereference cgroups v2
djdongjin Nov 28, 2024
1b7befc
Merge pull request #11098 from k8s-infra-cherrypick-robot/cherry-pick…
dmcgowan Dec 6, 2024
290e8bc
update to go1.23.4 / go1.22.10
akhilerm Dec 5, 2024
62b790b
CI: update Fedora to 41
AkihiroSuda Nov 1, 2024
ed0b75c
Merge pull request #11110 from k8s-infra-cherrypick-robot/cherry-pick…
AkihiroSuda Dec 6, 2024
154b692
Merge pull request #11109 from k8s-infra-cherrypick-robot/cherry-pick…
dmcgowan Dec 6, 2024
d93ae62
Merge pull request #11068 from k8s-infra-cherrypick-robot/cherry-pick…
samuelkarp Dec 9, 2024
44cdca6
ctr pull unpack for default platform using transfer service
djdongjin Dec 3, 2024
be5eda0
complete cri grpc config migration
djdongjin Nov 26, 2024
a2302ea
Add integration test for custom configuration
dmcgowan Nov 27, 2024
a53eff5
update runc binary to v1.2.3
thaJeztah Dec 11, 2024
5eb7995
feat: update go-cni version for CNI STATUS
MikeZappa87 Nov 25, 2024
018d836
internal/cri: should not apply IoOwner options
fuweid Dec 4, 2024
d5a99f0
Merge pull request #11142 from thaJeztah/2.0_backport_bump_runc_binary
estesp Dec 12, 2024
c403b64
Merge pull request #11140 from k8s-infra-cherrypick-robot/cherry-pick…
estesp Dec 12, 2024
e9004f0
Merge pull request #11146 from k8s-infra-cherrypick-robot/cherry-pick…
estesp Dec 12, 2024
8c6dd50
Merge pull request #11151 from k8s-infra-cherrypick-robot/cherry-pick…
dmcgowan Dec 12, 2024
c11f124
Merge pull request #11139 from k8s-infra-cherrypick-robot/cherry-pick…
dmcgowan Dec 12, 2024
eb2ce68
update xx to v1.6.1 for compatibility with alpine 3.21 and file 5.46+
thaJeztah Dec 10, 2024
eb2d0c4
Merge pull request #11153 from k8s-infra-cherrypick-robot/cherry-pick…
dmcgowan Dec 13, 2024
fe69570
build(deps): bump actions/attest-build-provenance from 1.4.4 to 2.1.0
dependabot[bot] Dec 9, 2024
e206c07
Merge pull request #11154 from k8s-infra-cherrypick-robot/cherry-pick…
mxpv Dec 13, 2024
b0ece5d
Prepare release notes for v2.0.1
dmcgowan Dec 13, 2024
88aa2f5
Merge pull request #11158 from dmcgowan/prepare-v2.0.1
dmcgowan Dec 13, 2024
0b7d0fe
Merge tag 'v2.0.1' into release-v2.0
Dec 19, 2024
c874316
v2.0.1
Dec 19, 2024
bbd9137
v2.0.1
Dec 19, 2024
18130ab
build(deps): bump the otel group across 1 directory with 8 updates
dependabot[bot] Mar 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
166 changes: 166 additions & 0 deletions .beagle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
kind: pipeline
name: docker

trigger:
branch:
- release-v2.0

workspace:
path: /go/src/github.com/containerd/containerd/v2

volumes:
- name: docker
host:
path: /var/run/docker.sock

clone:
disable: true

steps:
- name: s3-cache
image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0
settings:
restore: true
mount:
- ./.git
endpoint: https://cache.ali.wodcloud.com
access_key:
from_secret: S3_ACCESS_KEY_ALIYUN
secret_key:
from_secret: S3_SECRET_KEY_ALIYUN

- name: fetch
image: registry.cn-qingdao.aliyuncs.com/wod/devops-git:1.0
settings:
proxy:
from_secret: SOCKS5_PROXY

- name: golang
image: registry.cn-qingdao.aliyuncs.com/wod/golang:1.22-alpine
environment:
VERSION: 2.0.1-beagle
commands:
- bash ./.beagle/build-cross.sh

- name: golang-loong64
image: registry.cn-qingdao.aliyuncs.com/wod/golang:1.22-loongnix
environment:
VERSION: 2.0.1-beagle
commands:
- bash ./.beagle/build-loong64.sh

- name: nerdctl-amd64
image: registry.cn-qingdao.aliyuncs.com/wod/nerdctl:v2.0.2-amd64
environment:
TARGET_ARCH: amd64
commands:
- mkdir -p _output/linux/$TARGET_ARCH
- cp /usr/local/bin/nerdctl _output/linux/$TARGET_ARCH/nerdctl

- name: nerdctl-arm64
image: registry.cn-qingdao.aliyuncs.com/wod/nerdctl:v2.0.2-arm64
environment:
TARGET_ARCH: arm64
commands:
- mkdir -p _output/linux/$TARGET_ARCH
- cp /usr/local/bin/nerdctl _output/linux/$TARGET_ARCH/nerdctl

- name: nerdctl-loong64
image: registry.cn-qingdao.aliyuncs.com/wod/nerdctl:v2.0.2-loong64
environment:
TARGET_ARCH: loong64
commands:
- mkdir -p _output/linux/$TARGET_ARCH
- cp /usr/local/bin/nerdctl _output/linux/$TARGET_ARCH/nerdctl

- name: docker-amd64
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- name: docker
path: /var/run/docker.sock
settings:
dockerfile: .beagle/dockerfile
base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3-amd64
cwd: _output
repo: wod/containerd
version: v2.0.1
channel: amd64
args: "TARGETOS=linux,TARGETARCH=amd64"
registry: registry.cn-qingdao.aliyuncs.com
registry_user:
from_secret: REGISTRY_USER_ALIYUN
registry_password:
from_secret: REGISTRY_PASSWORD_ALIYUN

- name: docker-arm64
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- name: docker
path: /var/run/docker.sock
settings:
dockerfile: .beagle/dockerfile
base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3-arm64
cwd: _output
repo: wod/containerd
version: v2.0.1
channel: arm64
args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com
registry_user:
from_secret: REGISTRY_USER_ALIYUN
registry_password:
from_secret: REGISTRY_PASSWORD_ALIYUN

- name: docker-loong64
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- name: docker
path: /var/run/docker.sock
settings:
dockerfile: .beagle/dockerfile
base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3-amd64
cwd: _output
repo: wod/containerd
version: v2.0.1
channel: loong64
args: "TARGETOS=linux,TARGETARCH=loong64"
registry: registry.cn-qingdao.aliyuncs.com
registry_user:
from_secret: REGISTRY_USER_ALIYUN
registry_password:
from_secret: REGISTRY_PASSWORD_ALIYUN

---
kind: secret
name: SOCKS5_PROXY
get:
name: SOCKS5_PROXY
path: devops-secrets

---
kind: secret
name: REGISTRY_USER_ALIYUN
get:
name: REGISTRY_USER_ALIYUN
path: devops-secrets

---
kind: secret
name: REGISTRY_PASSWORD_ALIYUN
get:
name: REGISTRY_PASSWORD_ALIYUN
path: devops-secrets

---
kind: secret
name: S3_ACCESS_KEY_ALIYUN
get:
name: S3_ACCESS_KEY_ALIYUN
path: devops-secrets

---
kind: secret
name: S3_SECRET_KEY_ALIYUN
get:
name: S3_SECRET_KEY_ALIYUN
path: devops-secrets
107 changes: 107 additions & 0 deletions .beagle/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
# containerd

<https://github.com/containerd/containerd>

```bash
git remote add upstream git@github.com:containerd/containerd.git

git fetch upstream

git merge v2.0.1
```

## build

```bash
# golang build cross
docker run -it --rm \
-v $PWD/:/go/src/github.com/containerd/containerd/v2 \
-w /go/src/github.com/containerd/containerd/v2 \
-e VERSION=2.0.1-beagle \
registry.cn-qingdao.aliyuncs.com/wod/golang:1.22-alpine \
bash .beagle/build-cross.sh

# golang build
docker run -it --rm \
-v $PWD/:/go/src/github.com/containerd/containerd/v2 \
-w /go/src/github.com/containerd/containerd/v2 \
-e VERSION=2.0.1-beagle \
registry.cn-qingdao.aliyuncs.com/wod/golang:1.22 \
bash .beagle/build.sh

# golang build loong64
docker run -it --rm \
-v $PWD/:/go/src/github.com/containerd/containerd/v2 \
-w /go/src/github.com/containerd/containerd/v2 \
-e VERSION=2.0.1-beagle \
registry.cn-qingdao.aliyuncs.com/wod/golang:1.22-loongnix \
bash .beagle/build-loong64.sh
```

## test

```bash
file _output/linux-amd64/containerd

# amd64-test
docker run -it --rm \
-v $PWD/:/go/src/github.com/containerd/containerd/v2 \
-w /go/src/github.com/containerd/containerd/v2 \
registry.cn-qingdao.aliyuncs.com/wod/debian:bullseye-amd64 \
./_output/linux-amd64/containerd -v

docker run -it --rm \
-v $PWD/:/go/src/github.com/containerd/containerd/v2 \
-w /go/src/github.com/containerd/containerd/v2 \
registry.cn-qingdao.aliyuncs.com/wod/alpine:3-amd64 \
./_output/linux-amd64/containerd -v

# arm64-test
docker run -it --rm \
-v $PWD/:/go/src/github.com/containerd/containerd/v2 \
-w /go/src/github.com/containerd/containerd/v2 \
registry.cn-qingdao.aliyuncs.com/wod/debian:bullseye-arm64 \
./_output/linux-arm64/containerd -v

docker run -it --rm \
-v $PWD/:/go/src/github.com/containerd/containerd/v2 \
-w /go/src/github.com/containerd/containerd/v2 \
registry.cn-qingdao.aliyuncs.com/wod/alpine:3-arm64 \
./_output/linux-arm64/containerd -v

# loong64-test
docker run -it --rm \
-v $PWD/:/go/src/github.com/containerd/containerd/v2 \
-w /go/src/github.com/containerd/containerd/v2 \
registry.cn-qingdao.aliyuncs.com/wod/alpine:3-loong64 \
./_output/linux-loong64/containerd -v
```

## cache

```bash
# 构建缓存-->推送缓存至服务器
docker run --rm \
-e PLUGIN_REBUILD=true \
-e PLUGIN_ENDPOINT=$S3_ENDPOINT_ALIYUN \
-e PLUGIN_ACCESS_KEY=$S3_ACCESS_KEY_ALIYUN \
-e PLUGIN_SECRET_KEY=$S3_SECRET_KEY_ALIYUN \
-e DRONE_REPO_OWNER="open-beagle" \
-e DRONE_REPO_NAME="containerd" \
-e PLUGIN_MOUNT="./.git" \
-v $(pwd):$(pwd) \
-w $(pwd) \
registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0

# 读取缓存-->将缓存从服务器拉取到本地
docker run --rm \
-e PLUGIN_RESTORE=true \
-e PLUGIN_ENDPOINT=$S3_ENDPOINT_ALIYUN \
-e PLUGIN_ACCESS_KEY=$S3_ACCESS_KEY_ALIYUN \
-e PLUGIN_SECRET_KEY=$S3_SECRET_KEY_ALIYUN \
-e DRONE_REPO_OWNER="open-beagle" \
-e DRONE_REPO_NAME="containerd" \
-v $(pwd):$(pwd) \
-w $(pwd) \
registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0
```
26 changes: 26 additions & 0 deletions .beagle/build-cross.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env bash

set -ex

git config --global --add safe.directory $PWD

export CGO_ENABLED=0
export GO111MODULE=off
export STATIC=true
export BUILDTAGS="seccomp"
export VERSION=${VERSION:-2.0.0}
export REVISION=$(git rev-parse --short HEAD)

export TARGETPLATFORM=linux/amd64
xx-apk add musl-dev gcc btrfs-progs-dev
xx-go --wrap
make
mkdir -p _output/$TARGETPLATFORM/
mv bin/* _output/$TARGETPLATFORM/

export TARGETPLATFORM=linux/arm64
xx-apk add musl-dev gcc btrfs-progs-dev
xx-go --wrap
make
mkdir -p _output/$TARGETPLATFORM/
mv bin/* _output/$TARGETPLATFORM/
21 changes: 21 additions & 0 deletions .beagle/build-loong64.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/env bash

set -ex

git config --global --add safe.directory $PWD

apt-get update
apt-get install -y --no-install-recommends libbtrfs-dev

export CGO_ENABLED=0
export GO111MODULE=off
export STATIC=true
export BUILDTAGS="seccomp"
export VERSION=${VERSION:-v2.0.0}
export REVISION=$(git rev-parse --short HEAD)

export GOARCH=loong64
export CC=loongarch64-linux-gnu-gcc
make
mkdir -p _output/linux/$GOARCH/
mv bin/* _output/linux/$GOARCH/
24 changes: 24 additions & 0 deletions .beagle/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

set -ex

git config --global --add safe.directory $PWD

apt-get update
apt-get install -y --no-install-recommends libbtrfs-dev

export CGO_ENABLED=0
export GO111MODULE=off
export STATIC=true
export BUILDTAGS="seccomp"

export GOARCH=amd64
make
mkdir -p _output/linux/$GOARCH/
mv bin/* _output/linux/$GOARCH/

export GOARCH=arm64
export CC=aarch64-linux-gnu-gcc
make
mkdir -p _output/linux/$GOARCH/
mv bin/* _output/linux/$GOARCH/
13 changes: 13 additions & 0 deletions .beagle/dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
ARG BASE=alpine:3

FROM ${BASE}

ARG AUTHOR
ARG VERSION

LABEL maintainer=${AUTHOR} version=${VERSION}

ARG TARGETOS
ARG TARGETARCH

COPY ./${TARGETOS}/${TARGETARCH}/ /usr/local/bin/
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/go:1": {
"version": "1.23.2"
"version": "1.23.4"
}
},

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install-go/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: "Reusable action to install Go, so there is one place to bump Go ve
inputs:
go-version:
required: true
default: "1.23.2"
default: "1.23.4"
description: "Go version to install"

runs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/api-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
name: API Release

env:
GO_VERSION: "1.23.2"
GO_VERSION: "1.23.4"

permissions: # added using https://github.com/step-security/secure-workflows
contents: read
Expand Down
Loading
Loading