Skip to content

pkg(containerd): update to 1.6.15 #70

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
crazy-max merged 1 commit into from
Jan 11, 2023
Merged

pkg(containerd): update to 1.6.15 #70

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
2 changes: 1 addition & 1 deletion pkg/containerd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
ARG XX_VERSION="1.1.2"
ARG DEBIAN_FRONTEND="noninteractive"

# https://github.com/containerd/containerd/blob/v1.6.14/.github/workflows/ci.yml#L125
# https://github.com/containerd/containerd/blob/v1.6.15/.github/workflows/ci.yml#L125
ARG MD2MAN_VERSION="v2.0.1"

# common args
Expand Down
6 changes: 3 additions & 3 deletions pkg/containerd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@

include ../../common/vars.mk

# https://github.com/containerd/containerd/blob/v1.6.14/.github/workflows/release.yml#L9
# https://github.com/containerd/containerd/blob/v1.6.15/.github/workflows/release.yml#L9
export GO_VERSION = 1.18.9

DESTDIR ?= $(BASEDIR)/bin
BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl

export CONTAINERD_REPO := $(if $(CONTAINERD_REPO),$(CONTAINERD_REPO),https://github.com/containerd/containerd.git)
export CONTAINERD_REF := $(if $(CONTAINERD_REF),$(CONTAINERD_REF),v1.6.14)
export CONTAINERD_REF := $(if $(CONTAINERD_REF),$(CONTAINERD_REF),v1.6.15)
export RUNC_REPO := $(if $(RUNC_REPO),$(RUNC_REPO),https://github.com/opencontainers/runc.git)
export RUNC_REF := $(if $(RUNC_REF),$(RUNC_REF),)

export PKG_DEB_REVISION = 1

PKG_LIST ?= deb rpm static
# supported platforms: https://github.com/containerd/containerd/blob/v1.6.14/.github/workflows/ci.yml#L138-L156
# supported platforms: https://github.com/containerd/containerd/blob/v1.6.15/.github/workflows/ci.yml#L138-L156
# FIXME: can't build static binaries with containerd Makefile for darwin/amd64 darwin/arm64 windows/amd64 platforms
# FIXME: linux/riscv64 needs ubuntu:22.04 image
# FIXME: add linux/ppc64le when a remote PowerPC instance is available (too slow with QEMU)
Expand Down
6 changes: 6 additions & 0 deletions pkg/containerd/deb/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
containerd.io (1.6.15-1) release; urgency=medium

* Update containerd to v1.6.15

-- Sebastiaan van Stijn <thajeztah@docker.com> Mon, 09 Jan 2023 12:17:39 +0000

containerd.io (1.6.14-1) release; urgency=medium

* Update containerd to v1.6.14
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "CONTAINERD_REPO" {

# Sets the containerd ref.
variable "CONTAINERD_REF" {
default = "v1.6.14"
default = "v1.6.15"
Copy link
Copy Markdown
Member Author

@thaJeztah thaJeztah Jan 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a bit confusing that we have a default both in the makefile and in the bake file 🤔

Copy link
Copy Markdown
Member

@crazy-max crazy-max Jan 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, since docker/buildx#1449 we could just set default: null.

Also #73 should be merged first as we should always build from default branch imo. Let me know what you think.

}

# In case we want to set runc to a specific version instead of using
Expand Down
3 changes: 3 additions & 0 deletions pkg/containerd/rpm/containerd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ done


%changelog
* Mon Jan 09 2023 Sebastiaan van Stijn <thajeztah@docker.com> - 1.6.15-3.1
- Update containerd to v1.6.15

* Mon Dec 19 2022 Sebastiaan van Stijn <thajeztah@docker.com> - 1.6.14-3.1
- Update containerd to v1.6.14

Expand Down