From 25b14eba2fa1a346a0eedf121472d87f7c9cff74 Mon Sep 17 00:00:00 2001 From: "Arnaud Porterie (icecrime)" Date: Tue, 13 Dec 2016 17:25:41 -0800 Subject: [PATCH] Fix containerd casing Signed-off-by: Arnaud Porterie (icecrime) --- MAINTAINERS | 6 +++--- README.md | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 74d663b..c789701 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,4 +1,4 @@ -# Containerd project maintainers file +# containerd project maintainers file # # This file describes who runs the containerd project and how. # This is a living document - if you see something out of date or missing, @@ -104,7 +104,7 @@ by a pull request removing them. title = "The Benevolent dictator for life (BDFL)" text = """ -Containerd follows the timeless, highly efficient and totally unfair system +containerd follows the timeless, highly efficient and totally unfair system known as [Benevolent dictator for life](https://en.wikipedia.org/wiki/Benevolent_Dictator_for_Life), with yours truly, Solomon Hykes, in the role of BDFL. This means that all decisions are @@ -137,7 +137,7 @@ BDFL daily routine: text = """ Short answer: EVERYTHING IS A PULL REQUEST. -Containerd is an open-source project with an open design philosophy. This means +containerd is an open-source project with an open design philosophy. This means that the repository is the source of truth for EVERY aspect of the project, including its philosophy, design, road map, and APIs. *If it's part of the project, it's in the repo. If it's in the repo, it's part of the project.* diff --git a/README.md b/README.md index af6bb8d..9c12829 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # containerd -Containerd is an industry-standard container runtime with an emphasis on simplicity, robustness and portability. It is available as a daemon for Linux and Windows, which can manage the complete container lifecycle of its host system: image transfer and storage, container execution and supervision, low-level storage and network attachments, etc.. +containerd is an industry-standard container runtime with an emphasis on simplicity, robustness and portability. It is available as a daemon for Linux and Windows, which can manage the complete container lifecycle of its host system: image transfer and storage, container execution and supervision, low-level storage and network attachments, etc.. -Containerd is designed to be embedded into a larger system, rather than being used directly by developers or end-users. +containerd is designed to be embedded into a larger system, rather than being used directly by developers or end-users. ## Features @@ -29,7 +29,7 @@ The execution layer and overlay filesystems can be used independently but if you ### Primitives -Containerd should expose primitives to solve problems instead of building high level abstractions in the API. +containerd should expose primitives to solve problems instead of building high level abstractions in the API. A common example of this is how build would be implemented. Instead of having a build API in containerd we should expose the lower level primitives that allow things required in build to work. Breaking up the filesystem APIs to allow snapshots, copy functionality, and mounts allow people implementing build at the higher levels more flexibility. @@ -39,13 +39,13 @@ Breaking up the filesystem APIs to allow snapshots, copy functionality, and moun For the various components in containerd there should be defined extension points where implementations can be swapped for alternatives. The best example of this is that containerd will use `runc` from OCI as the default runtime in the execution layer but other runtimes conforming to the OCI Runtime specification they can be easily added to containerd. -Containerd will come with a default implementation for the various components. +containerd will come with a default implementation for the various components. These defaults will be chosen my the maintainers of the project and should not change unless better tech for that component comes out. Additional implementations will not be accepted into the core repository and should be developed in a separate repository not maintained by the containerd maintainers. ### Releases -Containerd will be released with a 1.0 when feature complete and this version will be supported for 1 year with security and bug fixes applied and released. +containerd will be released with a 1.0 when feature complete and this version 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. @@ -63,20 +63,20 @@ The table specifies whether or not the feature/component is in or out of scope. |------------------------------|--------------------------------------------------------------------------------------------------------|--------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | execution | Provide an extensible execution layer for executing a container | in | Create,start, stop pause, resume exec, signal, delete | | cow filesystem | Built in functionality for overlay, aufs, and other copy on write filesystems for containers | in | | -| distribution | Having the ability to push and pull images as well as operations on images as a first class api object | in | Containerd will fully support the management and retrieval of images | +| distribution | Having the ability to push and pull images as well as operations on images as a first class api object | in | containerd will fully support the management and retrieval of images | | low-level networking drivers | Providing network functionality to containers along with configuring their network namespaces | in | Network support will be added via interface and network namespace operations, not service discovery and service abstractions. | | build | Building images as a first class API | out | Build is a higher level tooling feature and can be implemented in many different ways on top of containerkit | | volumes | Volume management for external data | out | The api supports mounts, binds, etc where all volumes type systems can be built on top of. | | logging | Persisting container logs | out | Logging can be build on top of containerd because the container’s STDIO will be provided to the clients and they can persist any way they see fit.,There is no io copying of container STDIO in containerd. | -Containerd is scoped to a single host and makes assumptions based on that fact. +containerd is scoped to a single host and makes assumptions based on that fact. It can be used to builds things like a node agent that launches containers but does not have any concepts of a distributed system. -Containerd is designed to be embedded into a larger system, hence it only includes a barebone CLI (`ctr`) specifically for development and debugging purpose, with no mandate to be human-friendly, and no guarantee of interface stability over time. +containerd is designed to be embedded into a larger system, hence it only includes a barebone CLI (`ctr`) specifically for development and debugging purpose, with no mandate to be human-friendly, and no guarantee of interface stability over time. Also things like service discovery are out of scope even though networking is in scope. -Containerd should provide the primitives to create, add, remove, or manage network interfaces and network namespaces for a container but ip allocation, discovery, and DNS should be handled at higher layers. +containerd should provide the primitives to create, add, remove, or manage network interfaces and network namespaces for a container but ip allocation, discovery, and DNS should be handled at higher layers. ### How is the scope changed?