From 38ef0b6d3cccb7316057bec22b385fa9237ed1f2 Mon Sep 17 00:00:00 2001 From: Micheal Waltz Date: Sat, 30 Dec 2017 15:13:27 -0800 Subject: [PATCH 1/3] Updates to containerd.io index page - Fixes broken Dockercon link - Attemps to clarify 1.0.0 release and support status Signed-off-by: Micheal Waltz --- docs/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.md b/docs/index.md index ed47d9efc..aa9a95b8f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -5,7 +5,7 @@ layout: home ## News -* [Sign up for containerd Summit at DockerCon in April](dockercon-summit) +* [Sign up for containerd Summit at DockerCon in April](https://2018.dockercon.com) * [March 15th: Docker to donate containerd to the Cloud Native Computing Foundation](https://blog.docker.com/2017/03/docker-donates-containerd-to-cncf/) * [February 28th: containerd Summit recap](https://blog.docker.com/2017/02/containerd-summit-recap-slides-videos-meeting-notes/) * [January 4th: containerd Livestream recap](https://blog.docker.com/2017/01/containerd-livestream-recap) @@ -33,7 +33,7 @@ containerd is based on the Docker Engine’s core container runtime to benefit f * Management of network namespaces containers to join existing namespaces * Multi-tenant supported with CAS storage for global images -containerd, currently in [version 0.2.4](https://github.com/containerd/containerd/releases/tag/v0.2.4), is a daemon born from extracting the container execution subset of the Docker Engine, and is [used internally by Docker since the 1.11 release](https://blog.docker.com/2016/04/docker-engine-1-11-runc/). containerd will graduate to version 1.0 once its feature scope matches the requirements above, from which it will commit to API stability as well as committing to a 1-year LTS release. Docker Engine commits to upgrading to containerd 1.0 as part of its regular release cycle. +containerd, currently in [version 1.0.0](https://github.com/containerd/containerd/releases/tag/v1.0.0), is a daemon born from extracting the container execution subset of the Docker Engine, and is [used internally by Docker since the 1.11 release](https://blog.docker.com/2016/04/docker-engine-1-11-runc/). containerd version 1.0 will commit to API stability as well as committing to a 1-year LTS release. Docker Engine commits to upgrading to containerd 1.0 as part of its regular release cycle. [containerd roadmap](https://github.com/containerd/containerd/blob/master/ROADMAP.md) to implement these features is described in the containerd Github repository. @@ -74,7 +74,7 @@ Additional implementations will not be accepted into the core repository and sho ### Releases -containerd will be released with a 1.0 when feature complete with Linux and Windows parity and this version will be supported for 1 year with security and bug fixes applied and released. +containerd will be supported for 1 year with security and bug fixes applied and released. The upgrade path for containerd is that the 0.0.x patch releases are always backward compatible with its major and minor version. Minor (0.x.0) version will always be compatible with the previous minor release. i.e. 1.2.0 is backwards compatible with 1.1.0 and 1.1.0 is compatible with 1.0.0. From 43b655b5579ac808b0c406a044d3f9d36173cb5a Mon Sep 17 00:00:00 2001 From: Micheal Waltz Date: Tue, 2 Jan 2018 14:41:12 -0800 Subject: [PATCH 2/3] Link Docker release notes for containerd version Clarify which version of Docker use containerd versions and link to release notes. Signed-off-by: Micheal Waltz --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index aa9a95b8f..7b2217883 100644 --- a/docs/index.md +++ b/docs/index.md @@ -33,7 +33,7 @@ containerd is based on the Docker Engine’s core container runtime to benefit f * Management of network namespaces containers to join existing namespaces * Multi-tenant supported with CAS storage for global images -containerd, currently in [version 1.0.0](https://github.com/containerd/containerd/releases/tag/v1.0.0), is a daemon born from extracting the container execution subset of the Docker Engine, and is [used internally by Docker since the 1.11 release](https://blog.docker.com/2016/04/docker-engine-1-11-runc/). containerd version 1.0 will commit to API stability as well as committing to a 1-year LTS release. Docker Engine commits to upgrading to containerd 1.0 as part of its regular release cycle. +containerd, currently in [version 1.0.0](https://github.com/containerd/containerd/releases/tag/v1.0.0), is a daemon born from extracting the container execution subset of the Docker Engine, and is [used internally by Docker since the 1.11 release](https://blog.docker.com/2016/04/docker-engine-1-11-runc/). containerd versions prior to v1.0.0 were used in Docker 17.10 and earlier (see Docker [version release notes](https://github.com/docker/docker-ce/releases)), and [Docker 17.12](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce) is the first release to use containerd v1.0.0. [containerd roadmap](https://github.com/containerd/containerd/blob/master/ROADMAP.md) to implement these features is described in the containerd Github repository. From a929f9c74655221d09abebc9687d191c6169ae18 Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Mon, 12 Feb 2018 13:45:45 -0500 Subject: [PATCH 3/3] Add further updates for website refresh Signed-off-by: Phil Estes --- docs/index.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/docs/index.md b/docs/index.md index 7b2217883..15ef3b97b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -5,10 +5,13 @@ layout: home ## News -* [Sign up for containerd Summit at DockerCon in April](https://2018.dockercon.com) -* [March 15th: Docker to donate containerd to the Cloud Native Computing Foundation](https://blog.docker.com/2017/03/docker-donates-containerd-to-cncf/) -* [February 28th: containerd Summit recap](https://blog.docker.com/2017/02/containerd-summit-recap-slides-videos-meeting-notes/) -* [January 4th: containerd Livestream recap](https://blog.docker.com/2017/01/containerd-livestream-recap) +* [Sign up for DockerCon in June](https://2018.dockercon.com) +* [Feb 2018: containerd 1.0.2-rc.1 release](https://github.com/containerd/containerd/releases/tag/v1.0.2-rc.1) +* [Dec 2017: The New Stack: Containerd 1.0 Release Becomes the Public Face of Containers](https://thenewstack.io/containerd-1-0-release/) +* [Dec 2017: containerd 1.0 release announcement](https://blog.docker.com/2017/12/cncf-containerd-1-0-ga-announcement/) +* [March 2017: Docker to donate containerd to the Cloud Native Computing Foundation](https://blog.docker.com/2017/03/docker-donates-containerd-to-cncf/) +* [February 2017: containerd Summit recap](https://blog.docker.com/2017/02/containerd-summit-recap-slides-videos-meeting-notes/) +* [January 2017: containerd Livestream recap](https://blog.docker.com/2017/01/containerd-livestream-recap) ## About containerd @@ -33,9 +36,9 @@ containerd is based on the Docker Engine’s core container runtime to benefit f * Management of network namespaces containers to join existing namespaces * Multi-tenant supported with CAS storage for global images -containerd, currently in [version 1.0.0](https://github.com/containerd/containerd/releases/tag/v1.0.0), is a daemon born from extracting the container execution subset of the Docker Engine, and is [used internally by Docker since the 1.11 release](https://blog.docker.com/2016/04/docker-engine-1-11-runc/). containerd versions prior to v1.0.0 were used in Docker 17.10 and earlier (see Docker [version release notes](https://github.com/docker/docker-ce/releases)), and [Docker 17.12](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce) is the first release to use containerd v1.0.0. +containerd, currently in [version 1.0.1](https://github.com/containerd/containerd/releases/tag/v1.0.1), is a daemon born from extracting the container execution subset of the Docker Engine, and is [used internally by Docker since the 1.11 release](https://blog.docker.com/2016/04/docker-engine-1-11-runc/). containerd versions prior to v1.0.x were used in Docker 17.10 and earlier (see Docker [version release notes](https://github.com/docker/docker-ce/releases)), and [Docker 17.12](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce) is the first release to use containerd v1.0.0. -[containerd roadmap](https://github.com/containerd/containerd/blob/master/ROADMAP.md) to implement these features is described in the containerd Github repository. +The containerd maintainers do not provide a consolidated [containerd roadmap](https://github.com/containerd/containerd/blob/master/ROADMAP.md), but have chosen to use issues and milestones to track and implement major and minor features. ## Architecture