diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 8e8299dcc..000000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.4.2 diff --git a/Gemfile b/Gemfile deleted file mode 100644 index ba2062243..000000000 --- a/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source "https://rubygems.org" -gem "jekyll" -gem "jekyll-redirect-from" -gem "jekyll-seo-tag" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index e36d36a04..000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,69 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - colorator (1.1.0) - concurrent-ruby (1.0.5) - em-websocket (0.5.1) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - eventmachine (1.2.5) - ffi (1.9.18) - forwardable-extended (2.6.0) - http_parser.rb (0.6.0) - i18n (0.9.1) - concurrent-ruby (~> 1.0) - jekyll (3.7.0) - addressable (~> 2.4) - colorator (~> 1.0) - em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 2.0) - kramdown (~> 1.14) - liquid (~> 4.0) - mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (>= 1.7, < 4) - safe_yaml (~> 1.0) - jekyll-redirect-from (0.13.0) - jekyll (~> 3.3) - jekyll-sass-converter (1.5.1) - sass (~> 3.4) - jekyll-seo-tag (2.4.0) - jekyll (~> 3.3) - jekyll-watch (2.0.0) - listen (~> 3.0) - kramdown (1.16.2) - liquid (4.0.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - mercenary (0.3.6) - pathutil (0.16.1) - forwardable-extended (~> 2.6) - public_suffix (3.0.1) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rouge (3.1.0) - ruby_dep (1.5.0) - safe_yaml (1.0.4) - sass (3.5.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - -PLATFORMS - ruby - -DEPENDENCIES - jekyll - jekyll-redirect-from - jekyll-seo-tag - -BUNDLED WITH - 1.16.1 diff --git a/docs/.editorconfig b/docs/.editorconfig new file mode 100644 index 000000000..1aabdd3fa --- /dev/null +++ b/docs/.editorconfig @@ -0,0 +1,13 @@ +[*] +end_of_line = lf +charset = utf-8 +max_line_length = 80 +trim_trailing_whitespace = true +insert_final_newline = false + +[*.{html,js,sh,sass,md,mmark}] +indent_style = space +indent_size = 2 + +[Makefile] +indent_style = tab diff --git a/docs/.gitignore b/docs/.gitignore index fd582e5a6..4322a87a9 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,8 +1,6 @@ **/.DS_Store **/desktop.ini -.bundle/** -.jekyll-metadata -_site/** -.sass-cache/** CNAME -Gemfile.lock \ No newline at end of file + +# Hugo-generated content +public/ diff --git a/docs/Dockerfile b/docs/Dockerfile index 93e438dfe..979170769 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -15,4 +15,4 @@ FROM nginx -COPY _site /usr/share/nginx/html +COPY public /usr/share/nginx/html diff --git a/docs/hooks/pre_build b/docs/Makefile old mode 100755 new mode 100644 similarity index 73% rename from docs/hooks/pre_build rename to docs/Makefile index c65cef387..7c0c01abe --- a/docs/hooks/pre_build +++ b/docs/Makefile @@ -1,5 +1,3 @@ -#!/bin/bash - # Copyright The containerd Authors. # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,13 +12,20 @@ # See the License for the specific language governing permissions and # limitations under the License. +HUGO = hugo +BASE_URL = https://containerd.io -echo "=> Building the binary" -docker run --privileged \ - -v $(pwd):/usr/src/app \ - -v /var/run/docker.sock:/var/run/docker.sock \ - starefossen/github-pages jekyll build -echo $(pwd) -ls -la -ls -la _site +clean: + rm -rf public +build: clean + $(HUGO) \ + --baseURL $(BASE_URL) + +build-preview: clean + $(HUGO) + +dev: clean + $(HUGO) server \ + --disableFastRender \ + --ignoreCache diff --git a/docs/README.md b/docs/README.md index 03521e21f..aa5034833 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,10 +1,12 @@ # Containerd website -The containerd website is built using Jekyll and published to Github pages. +The containerd website at https://containerd.io is built using [Hugo](https://gohugo.io) and published to [Netlify](https://netlify.com). -In order to build and test locally: -``` -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. +To develop the site locally in "watch" mode (using Docker): + +```bash +$ docker run -it -v $(pwd):/src -p "1313:1313" -e HUGO_WATCH=true jojomi/hugo +``` + +You can then open up your browser to localhost:1313 to see the rendered site. The site auto-refreshes when you modify files locally. diff --git a/docs/_config.yml b/docs/_config.yml deleted file mode 100644 index b995e943a..000000000 --- a/docs/_config.yml +++ /dev/null @@ -1,23 +0,0 @@ -markdown: kramdown -kramdown: - input: GFM - html_to_native: true - hard_wrap: false - syntax_highlighter: rouge -incremental: true -permalink: pretty -safe: false -lsi: false -exclude: [README.md] - -plugins: - - jekyll-redirect-from - - jekyll-seo-tag - -defaults: - - - scope: - path: "" - type: "pages" - values: - layout: default diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html deleted file mode 100644 index 7a5fddefc..000000000 --- a/docs/_includes/footer.html +++ /dev/null @@ -1,21 +0,0 @@ -
-
- {% include links.html %} -
-
- Copyright (c) 2016-2018 the containerd authors -
-
- - - - - - diff --git a/docs/_includes/header.html b/docs/_includes/header.html deleted file mode 100644 index 8704ff2ee..000000000 --- a/docs/_includes/header.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - {{ page.title }} - - - - - - - -
diff --git a/docs/_includes/links.html b/docs/_includes/links.html deleted file mode 100644 index db44dd7b4..000000000 --- a/docs/_includes/links.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html deleted file mode 100644 index a250ae1d9..000000000 --- a/docs/_layouts/default.html +++ /dev/null @@ -1,15 +0,0 @@ -{% include header.html %} - -
-
containerdBy Docker
-
- {% include links.html %} -
-
-
-
- {{ content }} -
-
- -{% include footer.html %} diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html deleted file mode 100644 index d4a858c74..000000000 --- a/docs/_layouts/home.html +++ /dev/null @@ -1,18 +0,0 @@ -{% include header.html %} - -
-
-
containerd
-
- {% include links.html %} -
-
-

containerd | kənˈtānər D |
- an industry-standard container runtime
with an emphasis on simplicity,
robustness and portability.

-
-
-
- {{ content }} -
-
- -{% include footer.html %} diff --git a/docs/config.yaml b/docs/config.yaml new file mode 100644 index 000000000..cefa1a8b7 --- /dev/null +++ b/docs/config.yaml @@ -0,0 +1,16 @@ +title: containerd +baseURL: / +disableKinds: ["taxonomy", "taxonomyTerm"] + +params: + googleAnalyticsId: UA-71407002-1 + favicon: /img/favicon.png + fontImport: https://fonts.googleapis.com/css?family=Lato:300,400|Raleway:400,700i,800 + css: + - main + - flexboxgrid + - tomorrow-night + js: + - jquery-2.1.4.min + - highlight.min + - main diff --git a/docs/index.md b/docs/content/_index.md similarity index 79% rename from docs/index.md rename to docs/content/_index.md index 15ef3b97b..612df8950 100644 --- a/docs/index.md +++ b/docs/content/_index.md @@ -1,17 +1,9 @@ --- -title: containerd -layout: home --- ## News -* [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) +{{< news >}} ## About containerd @@ -23,18 +15,11 @@ 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 High Level Architecture](images/chart-a.png "Containerd High Level Architecture") - +![Containerd High Level Architecture](/img/chart-a.png "Containerd High Level Architecture") ## Features and roadmap -* OCI Image Spec support -* OCI Runtime Spec support (aka runC) -* Image push and pull support -* Container runtime and lifecycle support -* Network primitives for creation, modification, and deletion of interfaces -* Management of network namespaces containers to join existing namespaces -* Multi-tenant supported with CAS storage for global images +{{< features >}} 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. @@ -42,9 +27,9 @@ The containerd maintainers do not provide a consolidated [containerd roadmap](ht ## Architecture -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](images/chart-b.png "Containerd High Level Architecture") +![Containerd Architecture](/img/chart-b.png "Containerd High Level Architecture") ## Principles and Releases @@ -93,27 +78,27 @@ 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. -![Containerd and Docker](images/chart-c.png "Containerd and Docker") +![Containerd and Docker](/img/chart-c.png "Containerd and Docker") containerd 0.2.4 used in Docker 1.12 covers only container execution and process management. -![Containerd in Docker today](images/chart-g.png "Containerd in Docker today") +![Containerd in Docker today](/img/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 in Docker tomorrow](images/chart-d.png "Containerd in Docker tomorrow") +![Containerd in Docker tomorrow](/img/chart-d.png "Containerd in Docker tomorrow") 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](images/chart-a.png "Containerd, runc and OCI") +![Containerd, runc and OCI](/img/chart-a.png "Containerd, runc and OCI") 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. -![Containerd in the container ecosystem](images/chart-f.png "Containerd in the container ecosystem") +![Containerd in the container ecosystem](/img/chart-f.png "Containerd in the container ecosystem") 4. What is the relationship between containerd and cloud managed container services? @@ -121,6 +106,6 @@ See answer above: cloud managed container services can leverage containerd inste ## CNCF -![Containerd is a Cloud Native Computing Foundation member project](images/CNCF_Alternate_Pantone.png "Containerd is a Cloud Native Computing Foundation member project") +![Containerd is a Cloud Native Computing Foundation member project](/img/CNCF_Alternate_Pantone.png "Containerd is a Cloud Native Computing Foundation member project") We are a Cloud Native Computing Foundation member project. diff --git a/docs/client-opts.md b/docs/content/docs/client-opts.md similarity index 98% rename from docs/client-opts.md rename to docs/content/docs/client-opts.md index fbcf0ed93..d2053743b 100644 --- a/docs/client-opts.md +++ b/docs/content/docs/client-opts.md @@ -1,4 +1,7 @@ -# Client Options +--- +title: Client options +draft: true +--- The containerd client was built to be easily extended by consumers. The goal is that the execution flow of the calls remain the same across implementations while `Opts` are written to extend functionality. diff --git a/docs/dockercon-summit.md b/docs/content/docs/dockercon-summit.md similarity index 73% rename from docs/dockercon-summit.md rename to docs/content/docs/dockercon-summit.md index ceceb2bf5..51ee9cef1 100644 --- a/docs/dockercon-summit.md +++ b/docs/content/docs/dockercon-summit.md @@ -1,15 +1,15 @@ --- title: Dockercon 2017 Summit -layout: home +draft: true --- # Dockercon 2017 Summit -This year at Dockercon US 2017 we will be having a containerd Summit on Thursday morning the week of the conference. +This year at Dockercon US 2017 we will be having a containerd Summit on Thursday morning the week of the conference. -We are going to change the format slightly compared to the previous summit that was held in February. We will be allocating more time to the breakout sessions and less time to static talks. However, the group will be much larger than the previous summit so this document serves as a way to add discussion points for the breakout sessions. +We are going to change the format slightly compared to the previous summit that was held in February. We will be allocating more time to the breakout sessions and less time to static talks. However, the group will be much larger than the previous summit so this document serves as a way to add discussion points for the breakout sessions. -If you would like to add a discussion point to the agenda, submit a PR adding it to the list below. A simple one line sentence is enough or expand if needed. +If you would like to add a discussion point to the agenda, submit a PR adding it to the list below. A simple one line sentence is enough or expand if needed. If you have not signed up to attend the summit you can do so in this [form](https://docs.google.com/forms/d/e/1FAIpQLScNkLm984ABbFChPh02uJR2lJ6y1AXjFaDITCaxTFL-sHhPwQ/viewform). @@ -18,9 +18,9 @@ If you have not signed up to attend the summit you can do so in this [form](http The following are proposed discussion points for the containerd summit at Dockercon US 2017: -* Since containerd is one of the bottom bricks in the stack, how can we setup automated integration tests for consumers of containerd? +* Since containerd is one of the bottom bricks in the stack, how can we setup automated integration tests for consumers of containerd? * We'd like to propose an Authorization plugin to containerd that would allow an external component to police events like container start & stop (and have a discussion about the best way to go about it) * Should containerd provide image filesystem metrics? If yes, what metrics should be included? How to implement that? * Support for disk quotas: How? What is the role of containerd? How is it going to be integrated with volume managers that want to be in the same quota group? * Checkpoint/Restore: how can we support more use cases? One of the big issues here is the large number of options that can be passed to CRIU. -* How to support multi-OS docker images, for example, Linux Vs Windows using one graph driver plugin properly? +* How to support multi-OS docker images, for example, Linux Vs Windows using one graph driver plugin properly? diff --git a/docs/getting-started.md b/docs/content/docs/getting-started.md similarity index 99% rename from docs/getting-started.md rename to docs/content/docs/getting-started.md index c59adbe9c..2c2e4225e 100644 --- a/docs/getting-started.md +++ b/docs/content/docs/getting-started.md @@ -1,4 +1,7 @@ -# Getting started with containerd +--- +title: Getting started with containerd +draft: true +--- There are many different ways to use containerd. If you are a developer working on containerd you can use the `ctr` tool to quickly test features and functionality without writing extra code. diff --git a/docs/namespaces.md b/docs/content/docs/namespaces.md similarity index 97% rename from docs/namespaces.md rename to docs/content/docs/namespaces.md index 5f2fcdddf..3681b77ca 100644 --- a/docs/namespaces.md +++ b/docs/content/docs/namespaces.md @@ -1,4 +1,7 @@ -# containerd Namespaces and Multi-Tenancy +--- +title: containerd Namespaces and Multi-Tenancy +draft: true +--- containerd offers a fully namespaced API so multiple consumers can all use a single containerd instance without conflicting with one another. Namespaces allow multi-tenancy within a single daemon. This removes the need for the common pattern of using nested containers to achieve this separation. diff --git a/docs/ops.md b/docs/content/docs/ops.md similarity index 99% rename from docs/ops.md rename to docs/content/docs/ops.md index 2ac67b1de..5b4c08982 100644 --- a/docs/ops.md +++ b/docs/content/docs/ops.md @@ -1,4 +1,7 @@ -# containerd for Ops and Admins +--- +title: containerd for Ops and Admins +draft: true +--- containerd is meant to be a simple daemon to run on any system. It provides a minimal config with knobs to configure the daemon and what plugins are used when necessary. diff --git a/docs/data/features.yaml b/docs/data/features.yaml new file mode 100644 index 000000000..2a2055a82 --- /dev/null +++ b/docs/data/features.yaml @@ -0,0 +1,7 @@ +- OCI Image Spec support +- OCI Runtime Spec support (aka runC) +- Image push and pull support +- Container runtime and lifecycle support +- Network primitives for creation, modification, and deletion of interfaces +- Management of network namespaces containers to join existing namespaces +- Multi-tenant supported with CAS storage for global images \ No newline at end of file diff --git a/docs/data/news.yaml b/docs/data/news.yaml new file mode 100644 index 000000000..fa061abf2 --- /dev/null +++ b/docs/data/news.yaml @@ -0,0 +1,20 @@ +- title: Sign up for DockerCon in June + link: https://2018.dockercon.com/ +- title: containerd 1.0.2-rc.1 release + link: https://github.com/containerd/containerd/releases/tag/v1.0.2-rc.1 + date: February 2018 +- title: "The New Stack: Containerd 1.0 Release Becomes the Public Face of Containers" + link: https://thenewstack.io/containerd-1-0-release/ + date: December 2017 +- title: containerd 1.0 release announcement + link: https://blog.docker.com/2017/12/cncf-containerd-1-0-ga-announcement/ + date: December 2017 +- title: Docker to donate containerd to the Cloud Native Computing Foundation + link: https://blog.docker.com/2017/03/docker-donates-containerd-to-cncf/ + date: March 2017 +- title: containerd Summit recap + link: https://blog.docker.com/2017/02/containerd-summit-recap-slides-videos-meeting-notes/ + date: February 2017 +- title: containerd Livestream recap + link: https://blog.docker.com/2017/01/containerd-livestream-recap + date: January 2017 \ No newline at end of file diff --git a/docs/layouts/404.html b/docs/layouts/404.html new file mode 100644 index 000000000..ab8090d39 --- /dev/null +++ b/docs/layouts/404.html @@ -0,0 +1,5 @@ +{{ define "main" }} +

+ We're sorry, but this page could not be found. Return to the main site here. +

+{{ end }} \ No newline at end of file diff --git a/docs/layouts/_default/baseof.html b/docs/layouts/_default/baseof.html new file mode 100644 index 000000000..0e4d1ae1c --- /dev/null +++ b/docs/layouts/_default/baseof.html @@ -0,0 +1,35 @@ +{{- $prodSite := not .Site.IsServer -}} +{{- $faviconUrl := .Site.Params.favicon | absURL -}} +{{- $fontImport := .Site.Params.fontImport -}} + + + + {{ .Hugo.Generator }} + {{- partial "meta.html" . }} + {{ block "title" . }}{{ .Site.Title }}{{ end }} + {{- partial "css.html" . }} + + + + +
+
+ {{- partial "navbar.html" . }} + {{- partial "definition.html" . }} +
+
+
+ {{ block "main" . }} + {{ end }} +
+
+
+ + {{- partial "footer.html" . }} + + {{- partial "javascript.html" . }} + {{- if $prodSite }} + {{- partial "google-analytics.html" . }} + {{- end }} + + \ No newline at end of file diff --git a/docs/layouts/_default/single.html b/docs/layouts/_default/single.html new file mode 100644 index 000000000..f752ee316 --- /dev/null +++ b/docs/layouts/_default/single.html @@ -0,0 +1,3 @@ +{{ define "main" }} +{{ .Content }} +{{ end }} \ No newline at end of file diff --git a/docs/layouts/docs/single.html b/docs/layouts/docs/single.html new file mode 100644 index 000000000..6a3903cc1 --- /dev/null +++ b/docs/layouts/docs/single.html @@ -0,0 +1,3 @@ +{{ define "main" }} +

This is a docs page

+{{ end }} \ No newline at end of file diff --git a/docs/layouts/index.html b/docs/layouts/index.html new file mode 100644 index 000000000..f752ee316 --- /dev/null +++ b/docs/layouts/index.html @@ -0,0 +1,3 @@ +{{ define "main" }} +{{ .Content }} +{{ end }} \ No newline at end of file diff --git a/docs/layouts/partials/css.html b/docs/layouts/partials/css.html new file mode 100644 index 000000000..1d01438f3 --- /dev/null +++ b/docs/layouts/partials/css.html @@ -0,0 +1,4 @@ +{{- $cssFiles := .Site.Params.css -}} +{{- range $cssFiles }} + +{{- end }} \ No newline at end of file diff --git a/docs/layouts/partials/definition.html b/docs/layouts/partials/definition.html new file mode 100644 index 000000000..83bdb228f --- /dev/null +++ b/docs/layouts/partials/definition.html @@ -0,0 +1,3 @@ +

+ containerd | kənˈtānər D |
– an industry-standard container runtime
with an emphasis on simplicity,
robustness and portability. +

\ No newline at end of file diff --git a/docs/layouts/partials/footer.html b/docs/layouts/partials/footer.html new file mode 100644 index 000000000..062147d99 --- /dev/null +++ b/docs/layouts/partials/footer.html @@ -0,0 +1,10 @@ +
+
+
+ +
+
+
+ Copyright (c) 2016-2018 the containerd authors +
+
\ No newline at end of file diff --git a/docs/layouts/partials/google-analytics.html b/docs/layouts/partials/google-analytics.html new file mode 100644 index 000000000..4a998e548 --- /dev/null +++ b/docs/layouts/partials/google-analytics.html @@ -0,0 +1,9 @@ +{{- $gaId := .Site.Params.googleAnalyticsId }} + \ No newline at end of file diff --git a/docs/layouts/partials/javascript.html b/docs/layouts/partials/javascript.html new file mode 100644 index 000000000..70a23ad8d --- /dev/null +++ b/docs/layouts/partials/javascript.html @@ -0,0 +1,4 @@ +{{- $jsFiles := .Site.Params.js -}} +{{- range $jsFiles }} + +{{- end }} \ No newline at end of file diff --git a/docs/layouts/partials/meta.html b/docs/layouts/partials/meta.html new file mode 100644 index 000000000..17e627409 --- /dev/null +++ b/docs/layouts/partials/meta.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/docs/layouts/partials/navbar.html b/docs/layouts/partials/navbar.html new file mode 100644 index 000000000..f4017bf7a --- /dev/null +++ b/docs/layouts/partials/navbar.html @@ -0,0 +1,8 @@ +
+
containerd
+
+
+ +
+
+
\ No newline at end of file diff --git a/docs/layouts/shortcodes/features.html b/docs/layouts/shortcodes/features.html new file mode 100644 index 000000000..bfc0f5338 --- /dev/null +++ b/docs/layouts/shortcodes/features.html @@ -0,0 +1,6 @@ +{{- $features := .Site.Data.features }} + \ No newline at end of file diff --git a/docs/layouts/shortcodes/news.html b/docs/layouts/shortcodes/news.html new file mode 100644 index 000000000..f84413661 --- /dev/null +++ b/docs/layouts/shortcodes/news.html @@ -0,0 +1,10 @@ +{{- $news := .Site.Data.news }} + \ No newline at end of file diff --git a/docs/style/less/flexbox.less b/docs/source/less/flexbox.less similarity index 95% rename from docs/style/less/flexbox.less rename to docs/source/less/flexbox.less index 05193e654..d0d710909 100644 --- a/docs/style/less/flexbox.less +++ b/docs/source/less/flexbox.less @@ -75,7 +75,7 @@ // Flex shrink // - applies to: flex item shrink factor -// +// .flex-shrink(@shrink: 1) { -webkit-flex-shrink: @shrink; -moz-flex-shrink: @shrink; @@ -86,7 +86,7 @@ // Flex basis // - the initial main size of the flex item // - applies to: flex itemsnitial main size of the flex item -// +// .flex-basis(@width: auto) { -webkit-flex-basis: @width; -moz-flex-basis: @width; @@ -96,7 +96,7 @@ // Axis Alignment // - applies to: flex containers -// flex-start | flex-end | center | space-between | space-around +// flex-start | flex-end | center | space-between | space-around .justify-content(@justify: flex-start) { -webkit-justify-content: @justify; -moz-justify-content: @justify; @@ -106,7 +106,7 @@ // Packing Flex Lines // - applies to: multi-line flex containers -// flex-start | flex-end | center | space-between | space-around | stretch +// flex-start | flex-end | center | space-between | space-around | stretch .align-content(@align: stretch) { -webkit-align-content: @align; -moz-align-content: @align; @@ -116,7 +116,7 @@ // Cross-axis Alignment // - applies to: flex containers -// flex-start | flex-end | center | baseline | stretch +// flex-start | flex-end | center | baseline | stretch .align-items(@align: stretch) { -webkit-align-items: @align; -moz-align-items: @align; @@ -126,7 +126,7 @@ // Cross-axis Alignment // - applies to: flex items -// auto | flex-start | flex-end | center | baseline | stretch +// auto | flex-start | flex-end | center | baseline | stretch .align-self(@align: auto) { -webkit-align-self: @align; -moz-align-self: @align; diff --git a/docs/style/less/layout.less b/docs/source/less/layout.less similarity index 98% rename from docs/style/less/layout.less rename to docs/source/less/layout.less index ef0ccdcb4..f9cdf52fb 100644 --- a/docs/style/less/layout.less +++ b/docs/source/less/layout.less @@ -180,8 +180,8 @@ } @media screen and (max-width: 960px) { - .details, .terminal { - width: 100%; + .details, .terminal { + width: 100%; } .wrapper-terminal { padding: 0 2rem 2rem 2rem; @@ -192,7 +192,7 @@ .details { width: 60%; } - .terminal { + .terminal { width: 40%; } .wrapper-terminal { diff --git a/docs/style/less/main.less b/docs/source/less/main.less similarity index 100% rename from docs/style/less/main.less rename to docs/source/less/main.less diff --git a/docs/style/less/reset.less b/docs/source/less/reset.less similarity index 83% rename from docs/style/less/reset.less rename to docs/source/less/reset.less index af944401f..cf3d1dd17 100644 --- a/docs/style/less/reset.less +++ b/docs/source/less/reset.less @@ -1,4 +1,4 @@ -/* http://meyerweb.com/eric/tools/css/reset/ +/* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 License: none (public domain) */ @@ -12,8 +12,8 @@ b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; @@ -24,7 +24,7 @@ time, mark, audio, video { vertical-align: baseline; } /* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, +article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; } diff --git a/docs/style/less/variables.less b/docs/source/less/variables.less similarity index 100% rename from docs/style/less/variables.less rename to docs/source/less/variables.less diff --git a/docs/style/css/flexboxgrid.css b/docs/static/css/flexboxgrid.css similarity index 100% rename from docs/style/css/flexboxgrid.css rename to docs/static/css/flexboxgrid.css diff --git a/docs/style/css/main.css b/docs/static/css/main.css similarity index 99% rename from docs/style/css/main.css rename to docs/static/css/main.css index 3a337ba2f..891aff83a 100644 --- a/docs/style/css/main.css +++ b/docs/static/css/main.css @@ -105,7 +105,7 @@ section { display: block; } body { - background: url(../../images/bg10.jpg); + background: url(../../img/bg10.jpg); background-position: center; background-attachment: fixed; -webkit-background-size: cover; diff --git a/docs/style/css/tomorrow-night.css b/docs/static/css/tomorrow-night.css similarity index 100% rename from docs/style/css/tomorrow-night.css rename to docs/static/css/tomorrow-night.css diff --git a/docs/images/CNCF_Alternate_Pantone.png b/docs/static/img/CNCF_Alternate_Pantone.png similarity index 100% rename from docs/images/CNCF_Alternate_Pantone.png rename to docs/static/img/CNCF_Alternate_Pantone.png diff --git a/docs/images/GitHub-Mark-Light-64px.png b/docs/static/img/GitHub-Mark-Light-64px.png similarity index 100% rename from docs/images/GitHub-Mark-Light-64px.png rename to docs/static/img/GitHub-Mark-Light-64px.png diff --git a/docs/images/bg10.jpg b/docs/static/img/bg10.jpg similarity index 100% rename from docs/images/bg10.jpg rename to docs/static/img/bg10.jpg diff --git a/docs/images/chart-a.png b/docs/static/img/chart-a.png similarity index 100% rename from docs/images/chart-a.png rename to docs/static/img/chart-a.png diff --git a/docs/images/chart-b.png b/docs/static/img/chart-b.png similarity index 100% rename from docs/images/chart-b.png rename to docs/static/img/chart-b.png diff --git a/docs/images/chart-c.png b/docs/static/img/chart-c.png similarity index 100% rename from docs/images/chart-c.png rename to docs/static/img/chart-c.png diff --git a/docs/images/chart-d.png b/docs/static/img/chart-d.png similarity index 100% rename from docs/images/chart-d.png rename to docs/static/img/chart-d.png diff --git a/docs/images/chart-f.png b/docs/static/img/chart-f.png similarity index 100% rename from docs/images/chart-f.png rename to docs/static/img/chart-f.png diff --git a/docs/images/chart-g.png b/docs/static/img/chart-g.png similarity index 100% rename from docs/images/chart-g.png rename to docs/static/img/chart-g.png diff --git a/docs/images/containerd-dark-d.png b/docs/static/img/containerd-dark-d.png similarity index 100% rename from docs/images/containerd-dark-d.png rename to docs/static/img/containerd-dark-d.png diff --git a/docs/images/containerd-dark-d.svg b/docs/static/img/containerd-dark-d.svg similarity index 100% rename from docs/images/containerd-dark-d.svg rename to docs/static/img/containerd-dark-d.svg diff --git a/docs/images/containerd-dark.png b/docs/static/img/containerd-dark.png similarity index 100% rename from docs/images/containerd-dark.png rename to docs/static/img/containerd-dark.png diff --git a/docs/images/containerd-dark.svg b/docs/static/img/containerd-dark.svg similarity index 100% rename from docs/images/containerd-dark.svg rename to docs/static/img/containerd-dark.svg diff --git a/docs/images/containerd-light-d.png b/docs/static/img/containerd-light-d.png similarity index 100% rename from docs/images/containerd-light-d.png rename to docs/static/img/containerd-light-d.png diff --git a/docs/images/containerd-light-d.svg b/docs/static/img/containerd-light-d.svg similarity index 100% rename from docs/images/containerd-light-d.svg rename to docs/static/img/containerd-light-d.svg diff --git a/docs/images/containerd-light.png b/docs/static/img/containerd-light.png similarity index 100% rename from docs/images/containerd-light.png rename to docs/static/img/containerd-light.png diff --git a/docs/images/containerd-light.svg b/docs/static/img/containerd-light.svg similarity index 100% rename from docs/images/containerd-light.svg rename to docs/static/img/containerd-light.svg diff --git a/docs/images/containerd-spec.png b/docs/static/img/containerd-spec.png similarity index 100% rename from docs/images/containerd-spec.png rename to docs/static/img/containerd-spec.png diff --git a/docs/images/favicon.png b/docs/static/img/favicon.png similarity index 100% rename from docs/images/favicon.png rename to docs/static/img/favicon.png diff --git a/docs/style/js/highlight.min.js b/docs/static/js/highlight.min.js similarity index 100% rename from docs/style/js/highlight.min.js rename to docs/static/js/highlight.min.js diff --git a/docs/style/js/jquery-2.1.4.min.js b/docs/static/js/jquery-2.1.4.min.js similarity index 100% rename from docs/style/js/jquery-2.1.4.min.js rename to docs/static/js/jquery-2.1.4.min.js diff --git a/docs/style/js/main.js b/docs/static/js/main.js similarity index 100% rename from docs/style/js/main.js rename to docs/static/js/main.js