Skip to content

Conversation

@crazy-max
Copy link
Member

@crazy-max crazy-max commented Sep 4, 2022

Add containerd packages. Imports specs and rules from https://github.com/docker/containerd-packaging. The history is preserved:

$ sudo apt-get install git-filter-repo
$ git clone https://github.com/docker/containerd-packaging.git containerd-packaging-pick
$ cd containerd-packaging-pick/
$ git filter-repo --path common/containerd.toml --path debian --path rpm --path-rename debian:pkg/containerd/deb --path-rename rpm:pkg/containerd/rpm --path-rename common/containerd.toml:pkg/containerd/internal/containerd.toml
$ cd ../docker-packaging
$ git remote add containerd-packaging-pick ../containerd-packaging-pick
$ git fetch containerd-packaging-pick
$ git checkout -b containerd
# do interactive rebase
$ git merge --allow-unrelated-histories --signoff -S containerd-packaging-pick/master

Signed-off-by: CrazyMax crazy-max@users.noreply.github.com

seemethere and others added 30 commits April 23, 2018 20:45
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Add debian package building for ubuntu xenial
Signed-off-by: jose-bigio <jose.bigio@docker.com>
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
…es from Dockerfile. Updated the chnagelog, and started initial work on installing source from URL from within the spec file

Signed-off-by: jose-bigio <jose.bigio@docker.com>
Signed-off-by: jose-bigio <jose.bigio@docker.com>
Packaging containerd on centos
Signed-off-by: jose-bigio <jose.bigio@docker.com>
Gets rid of a lot of distro specific building stuff (we may need to add
some if statements somewhere in the spec file for dependencies).

Simplifies building structure, output will now all be in the `build/`
directory.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Makes it so that the version is correct whether or not we're building a
test version

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Signed-off-by: corbin-coleman <corbin.coleman@docker.com>
We'll verify the installation later on

Signed-off-by: corbin-coleman <corbin.coleman@docker.com>
Add a Jenkinsfile to build containerd packages
Uses the containerd Makefile to actually make the binaries instead of
relying on our own hacky `go build`

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Switch to using containerd build rigging
Why does this work?

`¯\_(ツ)_/¯`

Apparently cd'ing into our GOPATH solves everything so... I guess

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Make version report correctly on binaries
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
move all rpm build deps into spec file
move go-md2man to an rpm build dep
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
thaJeztah and others added 19 commits March 24, 2022 00:46
upstream also updated to go 1.17.8 for the 1.5.11 release

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- Update containerd to v1.6.2
- Update runc to v1.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- Update containerd to v1.6.3
- Update runc to v1.1.1
- Update Golang runtime to 1.17.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- do not "provide" runc on CentOS/RHEL >= 8
- do not build btrfs on CentOS/RHEL >= 8
- set the correct build-dependency for BTRFS on SUSE flavors and "others"

Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- Update containerd to v1.6.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
containerd and runc (no longer) use the seccomp and apparmor build-tags, and runc
has removed the runc_nokmem build-tag (now the default).

seccomp is enabled by default for containerd and runc, but can be disabled on
runc by setting BUILDTAGS to an empty string;
https://github.com/opencontainers/runc/blob/v1.1.2/README.md#build-tags

Given that we always want to include seccomp (with non-static builds), this patch
removes the BUILDTAGS altogether for runc.

For containerd, we still need a buildtag to disable btrfs on CentOS 8 and up;
https://github.com/containerd/containerd/blob/v1.6.5/BUILDING.md#build-containerd

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- Update containerd to v1.6.5
- Update runc to v1.1.2
- Update Golang runtime to 1.17.11

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
remove deprecated containerd and runc build-tags
- Update containerd to v1.6.6 to address CVE-2022-31030

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- Update containerd to v1.6.7
- Update runc to v1.1.3
- Update Golang runtime to 1.17.13 to address CVE-2022-32189

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- Update containerd to v1.6.8
- Update runc to v1.1.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@crazy-max
Copy link
Member Author

oh looks like we are out of credits 😰

The job was not started because recent account payments have failed or your spending limit needs to be increased. Please check the 'Billing & plans' section in your settings.

making repo public would solve this (cc @thaJeztah @chris-crone)

I run the build on my fork in the meantime and looks good: https://github.com/crazy-max/docker-packaging/actions/runs/2988362596

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

Thanks! Only had a VERY cursory look.

Wondering (as some of this comes from https://github.com/docker/containerd-packaging) if we can import files with history preserved (ah-la moby/sys#121)

@crazy-max

This comment was marked as off-topic.

@crazy-max
Copy link
Member Author

Wondering (as some of this comes from https://github.com/docker/containerd-packaging) if we can import files with history preserved (ah-la moby/sys#121)

Done

@crazy-max crazy-max requested a review from thaJeztah September 5, 2022 10:06
…containerd

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
@crazy-max crazy-max merged commit a3055bb into docker:main Sep 5, 2022
@crazy-max crazy-max deleted the containerd branch September 5, 2022 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.