github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1020 from chanezon/master

Browse Source 
retrying pr for website to satify cncf guidelines
This commit is contained in:
Michael Crosby 2017-06-16 14:39:25 -07:00 committed by GitHub
commit 4f20689d37
5 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/README.md
View File

@ -4,7 +4,7 @@ The containerd website is built using Jekyll and published to Github pages.
In order to build and test locally: In order to build and test locally:
``` ```
docker run -v "$PWD":/usr/src/app -p "4000:4000" starefossen/github-pages docker run -it -v "$PWD":/usr/src/app -p "4000:4000" starefossen/github-pages
``` ```
Then browser to localhost:4000 to see the rendered site. The site autorefreshes when you modify files locally. Then browser to localhost:4000 to see the rendered site. The site autorefreshes when you modify files locally.

42
docs/_includes/footer.html
View File

@ -1,21 +1,21 @@
<div class="footer"> <div class="footer">
<div class="footer-links"> <div class="footer-links">
{% include links.html %} {% include links.html %}
</div> </div>
<div class="copyright"> <div class="copyright">
Copyright (c) 2016, Docker Inc. Copyright (c) 2016-2017 the containerd authors
</div> </div>
</div> </div>
<script src="/style/js/jquery-2.1.4.min.js"></script> <script src="/style/js/jquery-2.1.4.min.js"></script>
<script src="/style/js/highlight.min.js"></script> <script src="/style/js/highlight.min.js"></script>
<script src="/style/js/main.js"></script> <script src="/style/js/main.js"></script>
<script> <script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-71407002-1', 'auto'); ga('create', 'UA-71407002-1', 'auto');
ga('send', 'pageview'); ga('send', 'pageview');
</script> </script>
</body> </body>
</html> </html>

2
docs/_includes/links.html
View File

@ -1,3 +1,3 @@
<div class="link"> <div class="link">
<a href="https://github.com/containerd/containerd"><img src="/images/GitHub-Mark-Light-64px.png"/></a> <a href="https://github.com/containerd/containerd"><img src="/images/containerd-light-d.png"/></a>
</div> </div>

BIN
docs/images/CNCF_Alternate_Pantone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

22
docs/index.md
View File

@ -20,7 +20,8 @@ containerd includes a daemon exposing gRPC API over a local UNIX socket. The API
containerd is based on the Docker Engine’s core container runtime to benefit from its maturity and existing contributors. containerd is based on the Docker Engine’s core container runtime to benefit from its maturity and existing contributors.
![Containerd High Level Architecture](/docs/images/chart-a.png "Containerd High Level Architecture") ![Containerd High Level Architecture](images/chart-a.png "Containerd High Level Architecture")
## Features and roadmap ## Features and roadmap
@ -40,7 +41,7 @@ containerd, currently in [version 0.2.4](https://github.com/containerd/container
Containerd [architecture](https://github.com/containerd/containerd/blob/master/design/architecture.md) and [API](https://github.com/containerd/containerd/tree/master/api/) are described in the Github repository. Containerd [architecture](https://github.com/containerd/containerd/blob/master/design/architecture.md) and [API](https://github.com/containerd/containerd/tree/master/api/) are described in the Github repository.
![Containerd Architecture](/docs/images/chart-b.png "Containerd High Level Architecture") ![Containerd Architecture](images/chart-b.png "Containerd High Level Architecture")
## Principles and Releases ## Principles and Releases
@ -88,28 +89,35 @@ Each major version will be supported for 1 year with bug fixes and security patc
Docker is a complete platform and programming environment for containerized applications. containerd is one of dozens of specialized components integrated into Docker. Developers and IT professionals looking to build, ship and run containerized applications should continue to use Docker. Operators and integrators looking for specialized components to swap into their platform should consider containerd. Docker is a complete platform and programming environment for containerized applications. containerd is one of dozens of specialized components integrated into Docker. Developers and IT professionals looking to build, ship and run containerized applications should continue to use Docker. Operators and integrators looking for specialized components to swap into their platform should consider containerd.
![Containerd and Docker](/docs/images/chart-c.png "Containerd and Docker")
![Containerd and Docker](images/chart-c.png "Containerd and Docker")
containerd 0.2.4 used in Docker 1.12 covers only container execution and process management. containerd 0.2.4 used in Docker 1.12 covers only container execution and process management.
![Containerd in Docker today](/docs/images/chart-g.png "Containerd in Docker today") ![Containerd in Docker today](images/chart-g.png "Containerd in Docker today")
containerd's roadmap is to refactor the Docker Engine codebase to extract more of its logic for distribution, networking and storage on a single host into a reusable component that Docker will use, and that can be used by other container orchestration projects or hosted container services. containerd's roadmap is to refactor the Docker Engine codebase to extract more of its logic for distribution, networking and storage on a single host into a reusable component that Docker will use, and that can be used by other container orchestration projects or hosted container services.
![Containerd in Docker tomorrow](/docs/images/chart-d.png "Containerd in Docker tomorrow") ![Containerd in Docker tomorrow](images/chart-d.png "Containerd in Docker tomorrow")
2. What is the relationship between containerd, OCI and runc? 2. What is the relationship between containerd, OCI and runc?
Docker [donated the OCI specification to the Linux Foundation in 2015](https://blog.docker.com/2015/06/open-container-project-foundation/), along with a reference implementation called `runc`. containerd integrates [OCI](https://www.opencontainers.org/)/[runc](https://runc.io/) into a feature-complete, production-ready core container runtime. runc is a component of containerd, the executor for containers. containerd has a wider scope than just executing containers: downloading container images, managing storage and network interfaces, calling runc with the right parameters to run containers. containerd fully leverages the Open Container Initiative’s (OCI) runtime, image format specifications and OCI reference implementation (runc) and will pursue OCI certification when it is available. Because of its massive adoption, containerd is the industry standard for implementing OCI. Docker [donated the OCI specification to the Linux Foundation in 2015](https://blog.docker.com/2015/06/open-container-project-foundation/), along with a reference implementation called `runc`. containerd integrates [OCI](https://www.opencontainers.org/)/[runc](https://runc.io/) into a feature-complete, production-ready core container runtime. runc is a component of containerd, the executor for containers. containerd has a wider scope than just executing containers: downloading container images, managing storage and network interfaces, calling runc with the right parameters to run containers. containerd fully leverages the Open Container Initiative’s (OCI) runtime, image format specifications and OCI reference implementation (runc) and will pursue OCI certification when it is available. Because of its massive adoption, containerd is the industry standard for implementing OCI.
![Containerd, runc and OCI](/docs/images/chart-a.png "Containerd, runc and OCI") ![Containerd, runc and OCI](images/chart-a.png "Containerd, runc and OCI")
3. What is the relationship between containerd and container orchestration systems like Kubernetes and Mesos? 3. What is the relationship between containerd and container orchestration systems like Kubernetes and Mesos?
Kubernetes today uses Docker directly. In a future version Kubernetes can implement container support in the Kubelet by implementing it's [Container Runtime Interface](https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/devel/container-runtime-interface.md) using containerd. Mesos and other orchestration engines can leverage containerd for core container runtime functionality as well. Kubernetes today uses Docker directly. In a future version Kubernetes can implement container support in the Kubelet by implementing it's [Container Runtime Interface](https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/devel/container-runtime-interface.md) using containerd. Mesos and other orchestration engines can leverage containerd for core container runtime functionality as well.
![Containerd in the container ecosystem](/docs/images/chart-f.png "Containerd in the container ecosystem") ![Containerd in the container ecosystem](images/chart-f.png "Containerd in the container ecosystem")
4. What is the relationship between containerd and cloud managed container services? 4. What is the relationship between containerd and cloud managed container services?
See answer above: cloud managed container services can leverage containerd instead of Docker in order to provide container functionalities to their users. See answer above: cloud managed container services can leverage containerd instead of Docker in order to provide container functionalities to their users.
## CNCF
![Containerd is a Cloud Native Computing Foundation member project](images/CNCF_Alternate_Pantone.png "Containerd is a Cloud Native Computing Foundation member project")
We are a Cloud Native Computing Foundation member project.