diff --git a/Dockerfile b/Dockerfile index 1588b4ea48..12f6f4c437 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,9 @@ COPY . md_source # into static HTML in the "target" directory using Jekyll # then nuke the md_source directory. +# Process this as an Edge release +ENV EDGE 1 + ## Branch to pull from, per ref doc ## To get master from svn the svn branch needs to be 'trunk'. To get a branch from svn it needs to be 'branches/branchname' ENV ENGINE_SVN_BRANCH="branches/17.04.x" @@ -43,7 +46,7 @@ RUN svn co https://github.com/docker/docker/$ENGINE_SVN_BRANCH/docs/extend md_so && wget -O md_source/engine/api/v1.25/swagger.yaml https://raw.githubusercontent.com/docker/docker/v1.13.0/api/swagger.yaml \ && wget -O md_source/engine/api/v1.26/swagger.yaml https://raw.githubusercontent.com/docker/docker/v17.03.0-ce/api/swagger.yaml \ && wget -O md_source/engine/api/v1.27/swagger.yaml https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/api/swagger.yaml \ - && jekyll build -s md_source -d target \ + && (if [ $EDGE -eq 1 ]; then jekyll build -s md_source -d target --config md_source/_config-edge.yml; else jekyll build -s md_source -d target; fi)\ && rm -rf target/apidocs/layouts \ && find target -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/#g' \ && rm -rf md_source diff --git a/_config-edge.yml b/_config-edge.yml new file mode 100644 index 0000000000..718e217a53 --- /dev/null +++ b/_config-edge.yml @@ -0,0 +1,173 @@ +name: Docker CE Edge Documentation +markdown: kramdown +kramdown: + input: GFM + html_to_native: true + hard_wrap: false + syntax_highlighter: rouge + toc_levels: 2..3 +incremental: true +permalink: pretty +safe: false +lsi: false +url: https://docs.docker.com/edge/ +keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11", "v1.12", "v1.13"] +edge: true # set to true if the next expected release is going to the edge channel + +gems: + - jekyll-redirect-from + - jekyll-seo-tag + - jekyll-relative-links + +webrick: + headers: + Cache-Control: 600 + +defaults: + - + scope: + path: "" + type: "pages" + values: + layout: docs + defaultassignee: johndmulhausen + enginebranch: 1.13.x + toc_min: 2 + toc_max: 3 + tree: true + - scope: + path: "compose" + values: + assignee: "londoncalling" + - scope: + path: "cs-engine" + values: + assignee: "joaofnfernandes" + - scope: + path: "datacenter" + values: + assignee: "joaofnfernandes" + - scope: + path: "docker-cloud" + values: + assignee: "londoncalling" + - scope: + path: "docker-for-mac" + values: + assignee: "londoncalling" + - scope: + path: "docker-for-windows" + values: + assignee: "londoncalling" + - scope: + path: "docker-hub" + values: + assignee: "johndmulhausen" + - scope: + path: "docker-store" + values: + assignee: "johndmulhausen" + - scope: + path: "engine" + values: + assignee: "mstanleyjones" + - scope: + path: "kitematic" + values: + assignee: "londoncalling" + - scope: + path: "machine" + values: + assignee: "londoncalling" + - scope: + path: "notary" + values: + assignee: "johndmulhausen" + - scope: + path: "registry" + values: + assignee: "joaofnfernandes" + - scope: + path: "swarm" + values: + assignee: "mstanleyjones" + - scope: + path: "toolbox" + values: + assignee: "londoncalling" + - + scope: + path: "datacenter" + values: + ucp_latest_image: "docker/ucp:2.1.2" + dtr_latest_image: "docker/dtr:2.2.3" + - + scope: + path: "datacenter/dtr/2.2" + values: + ucp_version: "2.1" + dtr_version: "2.2" + docker_image: "docker/dtr:2.2.3" + - + scope: + path: "datacenter/dtr/2.1" + values: + hide_from_sitemap: true + ucp_version: "2.0" + dtr_version: "2.1" + - + scope: + path: "datacenter/dtr/2.0" + values: + hide_from_sitemap: true + ucp_version: "1.1" + dtr_version: "2.0" + - + scope: + path: "datacenter/ucp/2.1" + values: + ucp_version: "2.1" + dtr_version: "2.2" + docker_image: "docker/ucp:2.1.2" + - + scope: + path: "datacenter/ucp/2.0" + values: + hide_from_sitemap: true + ucp_version: "2.0" + dtr_version: "2.1" + docker_image: "docker/ucp:2.0.3" + - + scope: + path: "datacenter/ucp/1.1" + values: + hide_from_sitemap: true + ucp_version: "1.1" + dtr_version: "2.0" + - + scope: + path: "apidocs/v1.3.3" + values: + hide_from_sitemap: true + - + scope: + path: "apidocs/v1.4.0" + values: + hide_from_sitemap: true + - + scope: + path: "apidocs/v2.0.0" + values: + hide_from_sitemap: true + - + scope: + path: "apidocs/v2.0.1" + values: + hide_from_sitemap: true + +# Assets +# +# We specify the directory for Jekyll so we can use @imports. +sass: + sass_dir: _scss + style: :compressed \ No newline at end of file diff --git a/_includes/global-header.html b/_includes/global-header.html index 7f82b14a91..7173aa7b44 100644 --- a/_includes/global-header.html +++ b/_includes/global-header.html @@ -40,7 +40,7 @@ + --> @@ -53,7 +53,7 @@
-

Docker Documentation

+

{{ site.name }}

Docker provides a way to run applications securely isolated in a container, packaged with all its dependencies and libraries.

  • Get Docker
    • diff --git a/_layouts/docs.html b/_layouts/docs.html index c2d05a9181..7d218a189a 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -82,9 +82,12 @@ else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor %
    - {% if page.title %} + {% if page.url == '/' %} +

    {{ site.name }}

    + {% else %} + {% if page.title %}

    {{ page.title }}

    {% endif %} {% if page.advisory %} -
    {{ site.data.advisories.texts[page.advisory] | markdownify }}
    {% endif %} {% unless page.tree == false %}{% include read_time.html %}{% endunless %}{{ content }} +
    {{ site.data.advisories.texts[page.advisory] | markdownify }}
    {% endif %}{% endif %} {% unless page.tree == false %}{% include read_time.html %}{% endunless %}{{ content }}