diff --git a/.NOT_EDITED_HERE.txt b/.NOT_EDITED_HERE.txt deleted file mode 100644 index 12164aede5..0000000000 --- a/.NOT_EDITED_HERE.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Files and directories here are not edited in the docker.github.io repo. -# Instead, they are edited in the appropriate upstream repo and pulled -# into this repo periodically. The intent is that if you submit a PR -# with changes to these files or directories, a CI job will fail in the -# PR, indicating that it should not be merged. - -# If you need to edit these files or directories, submit a PR in one of the -# following repos. The file will probably be located within the docs/ subdirectory. - -# docker-trusted-registry: n/a, file an issue -# engine: https://github.com/docker/docker -# compose: https://github.com/docker/compose -# notary: https://github.com/docker/notary -# registry: https://github.com/docker/distribution -# swarm: https://github.com/docker/swarm -# ucp: n/a, file an issue - -# Make sure directories have the trailing slash, keep the list alphabetical - -apidocs/ -compose/reference/ -docker-trusted-registry/reference/ -engine/deprecated.md -engine/extend/ -engine/reference/ -machine/reference/ -notary/reference/ -registry/configuration.md -registry/spec/ -swarm/reference/ -ucp/reference/ diff --git a/.NOT_EDITED_HERE.yaml b/.NOT_EDITED_HERE.yaml new file mode 120000 index 0000000000..6e88801400 --- /dev/null +++ b/.NOT_EDITED_HERE.yaml @@ -0,0 +1 @@ +_data/.NOT_EDITED_HERE.yaml \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ff1073d9e9..b6d84c2b56 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -9,6 +9,14 @@ let you know so that you can rebase it. >**Note**: To contribute code to Docker projects, see the [Contribution guidelines](opensource/project/who-written-for). +### Files not edited here + +Files and directories listed in the `path:` keys in +[`.NOT_EDITED_HERE.yaml`](/NOT_EDITED_HERE.yaml) are maintained in other +repositories and should not be edited in this one. Pull requests against these +files will be rejected. Make your edits to the files in the repository and path +in the `source:` key in the YAML file. + ### Quickstart If you spot a problem while reading the documentation and want to try to fix it @@ -79,10 +87,42 @@ The following `vnext` branches currently exist: docs for upcoming features in the [docker/kitematic](https://github.com/docker/kitematic/) project +## Collaborate on a pull request + +Unless the PR author specifically disables it, you can push commits into another +contributor's PR. You can do it from the command line by adding and fetching +their remote, checking out their branch, and adding commits to it. Even easier, +you can add commits from the Github web UI, by clicking the pencil icon for a +given file in the **Files** view. + +If a PR consists of multiple small addendum commits on top of a more significant +one, the commit will usually be "squash-merged", so that only one commit is +merged in. On occasion this is not appropriate and all commits will be kept +separate when merging. + +## Pull request guidelines + +Help us review your PRs more quickly by following these guidelines. + +- Try not to touch a large number of files in a single PR if possible. + +- Don't change whitespace or line wrapping in parts of a file you are not + editing for other reasons. Make sure your text editor is not configured to + automatically reformat the whole file when saving. + +- A Netlify test runs for each PR that is against one of our long-lived + branches like `master` and the `vnext` branches, and deploys the result of + your PR to a staging site. The URL will be available at the bottom of the PR + in the **Conversation** view. Check the staging site for problems and fix them + if necessary. Reviewers will check the staging site too. + +If you can think of other ways we could streamline the review process, let us +know. + ## Style guide -If you have questions about how to write for Docker's documentation, please see -the [style guide](https://docs.docker.com/opensource/doc-style/). The style guide provides -guidance about grammar, syntax, formatting, styling, language, or tone. If -something isn't clear in the guide, please submit an issue to let us know or -submit a pull request to help us improve it. +If you have questions about how to write for Docker's documentation, have a look +at the [style guide](https://docs.docker.com/opensource/doc-style/). The style +guide provides guidance about grammar, syntax, formatting, styling, language, or +tone. If something isn't clear in the guide, please submit an issue to let us +know or submit a pull request to help us improve it. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 403812517b..ae767832e8 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,33 +1,29 @@ - ### Describe the proposed changes - + -### Project version +### Unreleased project version - + ### Related issue - + ### Related issue or PR in another project - + ### Please take a look - + diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..2bf1c1ccf3 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.3.1 diff --git a/404.md b/404.md index 53e1ccdfd3..7fdb20e5e6 100644 --- a/404.md +++ b/404.md @@ -22,14 +22,14 @@ if (forwardingURL.indexOf(".md") > -1) // DOCS ARCHIVE CHECK {% for item in site.data.docsarchive.docker-compose %} - if (forwardingURL.indexOf("/{{ item[0] }}") > -1) + if (forwardingURL == "/{{ item[0] }}/") { console.log("Found via Docker Compose file for Acrhive") gonnaFwd = true; archive = true; // make it so redirects cascade; first, use the base URL, then append path - baseURL = "{{ page.archiveserver }}:{{ item[1].ports[0] | replace:':4000','' }}"; - newURL = forwardingURL.replace("/{{ item[0] }}",""); + baseURL = "{{ site.url }}"; + newURL = forwardingURL; }{% endfor %} if (archive==false) { diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..79fb6b8d7c --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "github-pages", "104" #Update me once in a while: https://github.com/github/pages-gem/releases diff --git a/README.md b/README.md index c61b8ab3eb..bcee65c334 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,15 @@ help. If a reviewer realizes you have based your work on the wrong branch, we'll let you know so that you can rebase it. >**Note**: To contribute code to Docker projects, see the -[Contribution guidelines](opensource/project/who-written-for). +[Contribution guidelines](https://docs.docker.com/opensource/project/who-written-for/). + +### Files not edited here + +Files and directories listed in the `path:` keys in +[`.NOT_EDITED_HERE.yaml`](.NOT_EDITED_HERE.yaml) are maintained in other +repositories and should not be edited in this one. Pull requests against these +files will be rejected. Make your edits to the files in the repository and path +in the `source:` key in the YAML file. ### Overall doc improvements @@ -93,8 +101,17 @@ The following `vnext` branches currently exist: docs for upcoming features in the [docker/kitematic](https://github.com/docker/kitematic/) project +## Per-PR staging on Github -## Staging +For every PR against `master` and all the long-lived branches, a staged version +of the site is built using Netlify. If the site builds, you will see +**deploy/netlify — Deploy preview ready**. Otherwise, you will see an error. +Click **Details** to review the staged site or the errors that prevented it from +building. Review the staged site and amend your commit if necessary. Reviewers +will also check the staged site before merging the PR, to protect the integrity +of [docs.docker.com](http://docs.docker.com/). + +## Staging locally You have three options: @@ -107,7 +124,7 @@ You have three options: ``` If you haven't got Docker Compose installed, - [follow these installation instructions](/compose/install/). + [follow these installation instructions](https://docs.docker.com/compose/install/). The container runs in the background and incrementally rebuilds the site each time a file changes. You can keep your browser open to http://localhost:4000/ @@ -150,7 +167,7 @@ directly on docs.docker.com. ## Style guide If you have questions about how to write for Docker's documentation, please see -the [style guide](/opensource/doc-style/). The style guide provides +the [style guide](https://docs.docker.com/opensource/doc-style/). The style guide provides guidance about grammar, syntax, formatting, styling, language, or tone. If something isn't clear in the guide, please submit an issue to let us know or submit a pull request to help us improve it. diff --git a/_config.yml b/_config.yml index b9ec22c145..87895bd9b5 100644 --- a/_config.yml +++ b/_config.yml @@ -13,13 +13,12 @@ url: https://docs.docker.com gems: - jekyll-redirect-from - - jekyll-gist - jekyll-seo-tag webrick: headers: Cache-Control: 600 - + defaults: - scope: @@ -27,4 +26,98 @@ defaults: type: "pages" values: layout: docs - archiveserver: "http://54.71.194.30" + defaultassignee: johndmulhausen + - 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: "sanscontext" + - scope: + path: "docker-for-mac" + values: + assignee: "londoncalling" + - scope: + path: "docker-for-windows" + values: + assignee: "londoncalling" + - scope: + path: "docker-hub" + values: + assignee: "sanscontext" + - 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/dtr/2.0" + values: + hide_from_sitemap: true + this_version: "2.0" + latest_version: "2.1" + - + scope: + path: "datacenter/ucp/1.1" + values: + hide_from_sitemap: true + this_version: "1.1" + latest_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 diff --git a/_data/.NOT_EDITED_HERE.yaml b/_data/.NOT_EDITED_HERE.yaml new file mode 100644 index 0000000000..65fbbfca1f --- /dev/null +++ b/_data/.NOT_EDITED_HERE.yaml @@ -0,0 +1,38 @@ +# Files and directories here are not edited in the docker.github.io repo. +# Instead, they are edited in the appropriate upstream repo and pulled +# into this repo periodically, or they are automatically generated. The intent +# is that if you submit a PR with changes to these files or directories, a CI +# job will fail in the PR, indicating that it should not be merged. THIS IS NOT +# YET IMPLEMENTED!! The PR reviewer should make sure no files here are in the PR. + +# If you need to edit these files or directories, submit a PR in the repo and +# directory listed in "source" below. + +# Make sure directories have the trailing slash, keep the list alphabetical + +- path: apidocs/ + description: "Auto-generated API docs for Docker Cloud, DTR, UCP. File an issue." + +- path: engine/deprecated.md + description: Docker Engine deprecation reference + source: https://github.com/docker/docker/docs/deprecated.md + +- path: engine/extend/ + description: References for Docker Engine plugin system + source: https://github.com/docker/docker/docs/extend/ + +- path: engine/reference/ + description: Docker Engine CLI and API references + source: https://github.com/docker/docker/docs/reference/ + +- path: notary/reference/ + description: Reference docs for Docker Notary + source: https://github.com/docker/notary/docs/reference/ + +- path: registry/configuration.md + description: Reference docs for configuring Docker Registry + source: https://github.com/docker/distribution/docs/configuration.md + +- path: registry/spec/ + description: Docker Registry API references + source: https://github.com/docker/distribution/docs/spec/ diff --git a/_data/docsarchive/archive.yml b/_data/docsarchive/archive.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/_data/toc.yaml b/_data/toc.yaml index 555ee55dc3..17851adc14 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -629,232 +629,210 @@ toc: title: CS Engine release notes - path: /cs-engine/release-notes/prior-release-notes/ title: Prior CS Engine release notes -- sectiontitle: Universal Control Plane +- sectiontitle: Docker Datacenter section: - - path: /ucp/overview/ - title: Universal Control Plane overview - - path: /ucp/install-sandbox/ - title: Install DDC in a sandbox for evaluation - - path: /ucp/install-sandbox-2/ - title: Evaluate DDC in a sandbox deployment - - path: /ucp/architecture/ - title: Architecture - - sectiontitle: Installation + - path: /datacenter/try/ + title: Try Docker Datacenter + - sectiontitle: Universal Control Plane 2.0 section: - - path: /ucp/installation/system-requirements/ - title: System requirements - - path: /ucp/installation/plan-production-install/ - title: Plan a production installation - - path: /ucp/installation/install-production/ - title: Install UCP for production - - path: /ucp/installation/install-offline/ - title: Install offline - - path: /ucp/installation/license/ - title: License UCP - - path: /ucp/installation/upgrade/ - title: Upgrade UCP - - path: /ucp/installation/uninstall/ - title: Uninstall UCP - - sectiontitle: UCP tool reference + - path: /datacenter/ucp/2.0/guides/ + title: Universal Control Plane overview + - path: /datacenter/ucp/2.0/guides/architecture/ + title: Architecture + - sectiontitle: Installation section: - - path: /ucp/reference/backup/ + - path: /datacenter/ucp/2.0/guides/installation/system-requirements/ + title: System requirements + - path: /datacenter/ucp/2.0/guides/installation/plan-production-install/ + title: Plan a production installation + - path: /datacenter/ucp/2.0/guides/installation/ + title: Install UCP for production + - path: /datacenter/ucp/2.0/guides/installation/install-offline/ + title: Install offline + - path: /datacenter/ucp/2.0/guides/installation/license/ + title: License UCP + - path: /datacenter/ucp/2.0/guides/installation/scale-your-cluster/ + title: Scale your cluster + - path: /datacenter/ucp/2.0/guides/installation/upgrade/ + title: Upgrade UCP + - path: /datacenter/ucp/2.0/guides/installation/uninstall/ + title: Uninstall UCP + - sectiontitle: Access UCP + section: + - path: /datacenter/ucp/2.0/guides/access-ucp/ + title: Web-based access + - path: /datacenter/ucp/2.0/guides/access-ucp/cli-based-access/ + title: CLI-based access + - sectiontitle: Configuration + section: + - path: /datacenter/ucp/2.0/guides/configuration/ + title: Use externally-signed certificates + - path: /datacenter/ucp/2.0/guides/configuration/configure-logs/ + title: Configure UCP logging + - path: /datacenter/ucp/2.0/guides/configuration/integrate-with-dtr/ + title: Integrate with Docker Trusted Registry + - path: /datacenter/ucp/2.0/guides/configuration/integrate-with-ldap/ + title: Integrate with LDAP + - path: /datacenter/ucp/2.0/guides/configuration/route-hostnames/ + title: Route hostnames to services + - sectiontitle: Monitor and troubleshoot + section: + - path: /datacenter/ucp/2.0/guides/monitor/ + title: Monitor your cluster + - path: /datacenter/ucp/2.0/guides/monitor/troubleshoot/ + title: Troubleshoot your cluster + - path: /datacenter/ucp/2.0/guides/monitor/troubleshoot-configurations/ + title: Troubleshoot cluster configurations + - sectiontitle: High-availability + section: + - path: /datacenter/ucp/2.0/guides/high-availability/ + title: Set up high availability + - path: /datacenter/ucp/2.0/guides/high-availability/backups-and-disaster-recovery/ + title: Backups and disaster recovery + - sectiontitle: User management + section: + - path: /datacenter/ucp/2.0/guides/user-management/ + title: Authentication and authorization + - path: /datacenter/ucp/2.0/guides/user-management/create-and-manage-users/ + title: Create and manage users + - path: /datacenter/ucp/2.0/guides/user-management/create-and-manage-teams/ + title: Create and manage teams + - path: /datacenter/ucp/2.0/guides/user-management/permission-levels/ + title: Permission levels + - sectiontitle: Applications + section: + - path: /datacenter/ucp/2.0/guides/applications/ + title: Deploy an app from the UI + - path: /datacenter/ucp/2.0/guides/applications/deploy-app-cli/ + title: Deploy an app from the CLI + - sectiontitle: Content trust + section: + - path: /datacenter/ucp/2.0/guides/content-trust/ + title: Run only images you trust + - path: /datacenter/ucp/2.0/guides/content-trust/manage-trusted-repositories/ + title: Manage trusted repositories + - sectiontitle: CLI reference + section: + - path: /datacenter/ucp/2.0/reference/cli/ + title: docker/ucp overview + - path: /datacenter/ucp/2.0/reference/cli/backup/ title: backup - - path: /ucp/reference/dump-certs/ + - path: /datacenter/ucp/2.0/reference/cli/dump-certs/ title: dump-certs - - path: /ucp/reference/engine-discovery/ - title: engine-discovery - - path: /ucp/reference/fingerprint/ + - path: /datacenter/ucp/2.0/reference/cli/fingerprint/ title: fingerprint - - path: /ucp/reference/help/ - title: help - - path: /ucp/reference/id/ + - path: /datacenter/ucp/2.0/reference/cli/id/ title: id - - path: /ucp/reference/images/ + - path: /datacenter/ucp/2.0/reference/cli/images/ title: images - - path: /ucp/reference/install/ + - path: /datacenter/ucp/2.0/reference/cli/install/ title: install - - path: /ucp/reference/join/ - title: join - - path: /ucp/reference/regen-certs/ - title: regen-certs.md - - path: /ucp/reference/restart/ + - path: /datacenter/ucp/2.0/reference/cli/restart/ title: restart - - path: /ucp/reference/restore/ + - path: /datacenter/ucp/2.0/reference/cli/restore/ title: restore - - path: /ucp/reference/stop/ + - path: /datacenter/ucp/2.0/reference/cli/stop/ title: stop - - path: /ucp/reference/support/ + - path: /datacenter/ucp/2.0/reference/cli/support/ title: support - - path: /ucp/reference/uninstall/ - title: uninstall - - path: /ucp/reference/upgrade/ + - path: /datacenter/ucp/2.0/reference/cli/uninstall-ucp/ + title: uninstall-ucp + - path: /datacenter/ucp/2.0/reference/cli/upgrade/ title: upgrade - - sectiontitle: Access UCP + - path: /datacenter/ucp/2.0/guides/support/ + title: Get support + - path: /datacenter/ucp/2.0/guides/release-notes/ + title: Release Notes + - sectiontitle: Docker Trusted Registry 2.1 section: - - path: /ucp/access-ucp/web-based-access/ - title: Web-based access - - path: /ucp/access-ucp/cli-based-access/ - title: CLI-based access - - sectiontitle: Configuration - section: - - path: /ucp/configuration/use-externally-signed-certs/ - title: Use externally-signed certificates - - path: /ucp/configuration/configure-logs/ - title: Configure UCP logging - - path: /ucp/configuration/dtr-integration/ - title: Integrate with Docker Trusted Registry - - path: /ucp/configuration/ldap-integration/ - title: Integrate with LDAP - - path: /ucp/configuration/multi-host-networking/ - title: Set up container networking - - sectiontitle: Monitor and troubleshoot - section: - - path: /ucp/monitor/monitor-ucp/ - title: Monitor your cluster - - path: /ucp/monitor/troubleshoot-ucp/ - title: Troubleshoot your cluster - - path: /ucp/monitor/troubleshoot-configurations/ - title: Troubleshoot cluster configurations - - sectiontitle: High-availability - section: - - path: /ucp/high-availability/set-up-high-availability/ - title: Set up high availability - - path: /ucp/high-availability/replicate-cas/ - title: Replicate CAs for high availability - - path: /ucp/high-availability/backups-and-disaster-recovery/ - title: Backups and disaster recovery - - sectiontitle: User management - section: - - path: /ucp/user-management/authentication-and-authorization/ - title: Authentication and authorization - - path: /ucp/user-management/create-and-manage-users/ - title: Create and manage users - - path: /ucp/user-management/create-and-manage-teams/ - title: Create and manage teams - - path: /ucp/user-management/permission-levels/ - title: Permission levels - - sectiontitle: Applications - section: - - path: /ucp/applications/deploy-app-ui/ - title: Deploy an app from the UI - - path: /ucp/applications/deploy-app-cli/ - title: Deploy an app from the CLI - - path: /ucp/support/ - title: Get support - - path: /ucp/release_notes/ - title: Release Notes -- sectiontitle: Docker Trusted Registry - section: - - path: /docker-trusted-registry/ - title: Docker Trusted Registry overview - - path: /docker-trusted-registry/architecture/ - title: Architecture - - sectiontitle: Installation - section: - - path: /docker-trusted-registry/install/system-requirements/ - title: System requirements - - path: /docker-trusted-registry/install/ - title: Install Docker Trusted Registry - - path: /docker-trusted-registry/install/install-dtr-offline/ - title: Install offline - - path: /docker-trusted-registry/install/license/ - title: License DTR - - sectiontitle: Upgrade + - path: /datacenter/dtr/2.1/guides/ + title: Docker Trusted Registry overview + - path: /datacenter/dtr/2.1/guides/architecture/ + title: Architecture + - sectiontitle: Installation section: - - path: /docker-trusted-registry/install/upgrade/upgrade-major/ - title: Upgrade from 1.4.3 - - path: /docker-trusted-registry/install/upgrade/ - title: Upgrade from 2.0.0 - - path: /docker-trusted-registry/install/uninstall/ - title: Uninstall - - sectiontitle: docker/dtr image reference + - path: /datacenter/dtr/2.1/guides/install/system-requirements/ + title: System requirements + - path: /datacenter/dtr/2.1/guides/install/ + title: Install Docker Trusted Registry + - path: /datacenter/dtr/2.1/guides/install/install-offline/ + title: Install offline + - path: /datacenter/dtr/2.1/guides/install/license/ + title: License your deployment + - path: /datacenter/dtr/2.1/guides/install/upgrade/ + title: Upgrade + - path: /datacenter/dtr/2.1/guides/install/uninstall/ + title: Uninstall + - sectiontitle: Configuration section: - - path: /docker-trusted-registry/reference/ - title: Overview - - path: /docker-trusted-registry/reference/backup/ - title: backup - - path: /docker-trusted-registry/reference/dumpcerts/ - title: dumpcerts - - path: /docker-trusted-registry/reference/images/ - title: images - - path: /docker-trusted-registry/reference/install/ - title: install - - path: /docker-trusted-registry/reference/join/ - title: join - - path: /docker-trusted-registry/reference/migrate/ - title: migrate - - path: /docker-trusted-registry/reference/reconfigure/ - title: reconfigure - - path: /docker-trusted-registry/reference/remove/ - title: remove - - path: /docker-trusted-registry/reference/restore/ - title: restore - - path: /docker-trusted-registry/reference/upgrade/ - title: upgrade - - sectiontitle: Configuration - section: - - path: /docker-trusted-registry/configure/configuration/ - title: Configuration overview - - path: /docker-trusted-registry/configure/config-general/ - title: Configure general settings - - path: /docker-trusted-registry/configure/config-security/ - title: Security configuration - - path: /docker-trusted-registry/configure/config-storage/ - title: Storage configuration - - sectiontitle: Monitor and troubleshoot - section: - - path: /docker-trusted-registry/monitor-troubleshoot/ - title: Monitor DTR - - path: /docker-trusted-registry/monitor-troubleshoot/troubleshoot/ - title: Troubleshoot DTR - - sectiontitle: High-availability - section: - - path: /docker-trusted-registry/high-availability/ - title: Set up high availability - - path: /docker-trusted-registry/high-availability/backups-and-disaster-recovery/ - title: Backups and disaster recovery - - sectiontitle: User management - section: - - path: /docker-trusted-registry/user-management/ - title: Authentication and authorization - - path: /docker-trusted-registry/user-management/create-and-manage-users/ - title: Create and manage users - - path: /docker-trusted-registry/user-management/create-and-manage-orgs/ - title: Create and manage organizations - - path: /docker-trusted-registry/user-management/create-and-manage-teams/ - title: Create and manage teams - - path: /docker-trusted-registry/user-management/permission-levels/ - title: Permission levels - - sectiontitle: Repositories and images - section: - - path: /docker-trusted-registry/repos-and-images/ - title: Configure your Docker Engine - - path: /docker-trusted-registry/repos-and-images/pull-an-image/ - title: Pull an image - - path: /docker-trusted-registry/repos-and-images/push-an-image/ - title: Push an image - - path: /docker-trusted-registry/repos-and-images/delete-an-image/ - title: Delete an image - - sectiontitle: DTR APIs - section: - - path: /apidocs/overview/ - title: Overview - - path: /apidocs/v1.3.3/ - title: v1.3.3 API - - path: /apidocs/v1.4.0/ - title: v1.4.0 API - - path: /apidocs/v2.0.0/ - title: v2.0.0 API - - path: /apidocs/v2.0.1/ - title: v2.0.1 API - - sectiontitle: Release notes - section: - - path: /docker-trusted-registry/release-notes/ - title: Trusted Registry release notes - - path: /docker-trusted-registry/release-notes/prior-release-notes/ - title: Prior Trusted Registry release notes - - path: /docker-trusted-registry/support/ - title: Get support + - path: /datacenter/dtr/2.1/guides/configure/ + title: Use your own certificates + - path: /datacenter/dtr/2.1/guides/configure/configure-storage/ + title: Storage configuration + - sectiontitle: Monitor and troubleshoot + section: + - path: /datacenter/dtr/2.1/guides/monitor-troubleshoot/ + title: Monitor DTR + - path: /datacenter/dtr/2.1/guides/monitor-troubleshoot/troubleshoot/ + title: Troubleshoot DTR + - sectiontitle: High-availability + section: + - path: /datacenter/dtr/2.1/guides/high-availability/ + title: Set up high availability + - path: /datacenter/dtr/2.1/guides/high-availability/backups-and-disaster-recovery/ + title: Backups and disaster recovery + - sectiontitle: User management + section: + - path: /datacenter/dtr/2.1/guides/user-management/ + title: Authentication and authorization + - path: /datacenter/dtr/2.1/guides/user-management/create-and-manage-users/ + title: Create and manage users + - path: /datacenter/dtr/2.1/guides/user-management/create-and-manage-orgs/ + title: Create and manage organizations + - path: /datacenter/dtr/2.1/guides/user-management/create-and-manage-teams/ + title: Create and manage teams + - path: /datacenter/dtr/2.1/guides/user-management/permission-levels/ + title: Permission levels + - sectiontitle: Repositories and images + section: + - path: /datacenter/dtr/2.1/guides/repos-and-images/ + title: Configure your Docker Engine + - path: /datacenter/dtr/2.1/guides/repos-and-images/pull-an-image/ + title: Pull an image + - path: /datacenter/dtr/2.1/guides/repos-and-images/push-an-image/ + title: Push an image + - path: /datacenter/dtr/2.1/guides/repos-and-images/delete-an-image/ + title: Delete an image + - sectiontitle: API and CLI reference + section: + - path: /datacenter/dtr/2.1/reference/api/ + title: API reference + - sectiontitle: CLI reference + section: + - path: /datacenter/dtr/2.1/reference/cli/ + title: Overview + - path: /datacenter/dtr/2.1/reference/cli/backup/ + title: backup + - path: /datacenter/dtr/2.1/reference/cli/dumpcerts/ + title: dumpcerts + - path: /datacenter/dtr/2.1/reference/cli/images/ + title: images + - path: /datacenter/dtr/2.1/reference/cli/install/ + title: install + - path: /datacenter/dtr/2.1/reference/cli/join/ + title: join + - path: /datacenter/dtr/2.1/reference/cli/reconfigure/ + title: reconfigure + - path: /datacenter/dtr/2.1/reference/cli/remove/ + title: remove + - path: /datacenter/dtr/2.1/reference/cli/restore/ + title: restore + - path: /datacenter/dtr/2.1/reference/cli/upgrade/ + title: upgrade + - path: /datacenter/dtr/2.1/guides/release-notes/ + title: Release notes + - path: /datacenter/dtr/2.1/guides/support/ + title: Get support - sectiontitle: Docker Cloud section: - path: /docker-cloud/overview/ @@ -1075,6 +1053,8 @@ toc: title: Amazon Web Services - path: /machine/drivers/digital-ocean/ title: Digital Ocean + - path: /machine/drivers/exoscale/ + title: Exoscale - path: /machine/drivers/generic/ title: Generic - path: /machine/drivers/gce/ @@ -1097,15 +1077,13 @@ toc: title: VMware vCloud Air - path: /machine/drivers/vsphere/ title: VMware vSphere - - path: /machine/drivers/exoscale/ - title: exoscale - path: /machine/completion/ title: Command-line Completion - sectiontitle: Docker Store section: - path: /docker-store/ title: Docker Store Overview - - path: /docker-store/ + - path: /docker-store/publish/ title: Submit a product to Docker Store - path: /docker-store/faq/ title: Docker Store FAQs @@ -1367,5 +1345,252 @@ toc: title: Docker Release Notes - path: /engine/reference/glossary/ title: Docker Glossary -- title: Docs archive +- sectiontitle: Docs archive + section: + - path: /docsarchive/ + title: View the docs archives + - path: /v1.4 + title: v1.4 + - path: /v1.5 + title: v1.5 + - path: /v1.6 + title: v1.6 + - path: /v1.7 + title: v1.7 + - path: /v1.8 + title: v1.8 + - path: /v1.9 + title: v1.9 + - path: /v1.10 + title: v1.10 + - path: /v1.11 + title: v1.11 +- sectiontitle: Docker Datacenter archive + section: + - sectiontitle: Universal Control Plane 1.0 + section: + - path: /datacenter/ucp/1.1/overview/ + title: Universal Control Plane overview + - path: /datacenter/ucp/1.1/install-sandbox/ + title: Install DDC in a sandbox for evaluation + - path: /datacenter/ucp/1.1/install-sandbox-2/ + title: Evaluate DDC in a sandbox deployment + - path: /datacenter/ucp/1.1/architecture/ + title: Architecture + - sectiontitle: Installation + section: + - path: /datacenter/ucp/1.1/installation/system-requirements/ + title: System requirements + - path: /datacenter/ucp/1.1/installation/plan-production-install/ + title: Plan a production installation + - path: /datacenter/ucp/1.1/installation/install-production/ + title: Install UCP for production + - path: /datacenter/ucp/1.1/installation/install-offline/ + title: Install offline + - path: /datacenter/ucp/1.1/installation/license/ + title: License UCP + - path: /datacenter/ucp/1.1/installation/upgrade/ + title: Upgrade UCP + - path: /datacenter/ucp/1.1/installation/uninstall/ + title: Uninstall UCP + - sectiontitle: UCP tool reference + section: + - path: /datacenter/ucp/1.1/reference/backup/ + title: backup + - path: /datacenter/ucp/1.1/reference/dump-certs/ + title: dump-certs + - path: /datacenter/ucp/1.1/reference/engine-discovery/ + title: engine-discovery + - path: /datacenter/ucp/1.1/reference/fingerprint/ + title: fingerprint + - path: /datacenter/ucp/1.1/reference/help/ + title: help + - path: /datacenter/ucp/1.1/reference/id/ + title: id + - path: /datacenter/ucp/1.1/reference/images/ + title: images + - path: /datacenter/ucp/1.1/reference/install/ + title: install + - path: /datacenter/ucp/1.1/reference/join/ + title: join + - path: /datacenter/ucp/1.1/reference/regen-certs/ + title: regen-certs.md + - path: /datacenter/ucp/1.1/reference/restart/ + title: restart + - path: /datacenter/ucp/1.1/reference/restore/ + title: restore + - path: /datacenter/ucp/1.1/reference/stop/ + title: stop + - path: /datacenter/ucp/1.1/reference/support/ + title: support + - path: /datacenter/ucp/1.1/reference/uninstall/ + title: uninstall + - path: /datacenter/ucp/1.1/reference/upgrade/ + title: upgrade + - sectiontitle: Access UCP + section: + - path: /datacenter/ucp/1.1/access-ucp/web-based-access/ + title: Web-based access + - path: /datacenter/ucp/1.1/access-ucp/cli-based-access/ + title: CLI-based access + - sectiontitle: Configuration + section: + - path: /datacenter/ucp/1.1/configuration/use-externally-signed-certs/ + title: Use externally-signed certificates + - path: /datacenter/ucp/1.1/configuration/configure-logs/ + title: Configure UCP logging + - path: /datacenter/ucp/1.1/configuration/dtr-integration/ + title: Integrate with Docker Trusted Registry + - path: /datacenter/ucp/1.1/configuration/ldap-integration/ + title: Integrate with LDAP + - path: /datacenter/ucp/1.1/configuration/multi-host-networking/ + title: Set up container networking + - sectiontitle: Monitor and troubleshoot + section: + - path: /datacenter/ucp/1.1/monitor/monitor-ucp/ + title: Monitor your cluster + - path: /datacenter/ucp/1.1/monitor/troubleshoot-ucp/ + title: Troubleshoot your cluster + - path: /datacenter/ucp/1.1/monitor/troubleshoot-configurations/ + title: Troubleshoot cluster configurations + - sectiontitle: High-availability + section: + - path: /datacenter/ucp/1.1/high-availability/set-up-high-availability/ + title: Set up high availability + - path: /datacenter/ucp/1.1/high-availability/replicate-cas/ + title: Replicate CAs for high availability + - path: /datacenter/ucp/1.1/high-availability/backups-and-disaster-recovery/ + title: Backups and disaster recovery + - sectiontitle: User management + section: + - path: /datacenter/ucp/1.1/user-management/authentication-and-authorization/ + title: Authentication and authorization + - path: /datacenter/ucp/1.1/user-management/create-and-manage-users/ + title: Create and manage users + - path: /datacenter/ucp/1.1/user-management/create-and-manage-teams/ + title: Create and manage teams + - path: /datacenter/ucp/1.1/user-management/permission-levels/ + title: Permission levels + - sectiontitle: Applications + section: + - path: /datacenter/ucp/1.1/applications/deploy-app-ui/ + title: Deploy an app from the UI + - path: /datacenter/ucp/1.1/applications/deploy-app-cli/ + title: Deploy an app from the CLI + - path: /datacenter/ucp/1.1/support/ + title: Get support + - path: /datacenter/ucp/1.1/release_notes/ + title: Release Notes + - sectiontitle: Docker Trusted Registry 2.0 + section: + - path: /datacenter/dtr/2.0/ + title: Docker Trusted Registry overview + - path: /datacenter/dtr/2.0/architecture/ + title: Architecture + - sectiontitle: Installation + section: + - path: /datacenter/dtr/2.0/install/system-requirements/ + title: System requirements + - path: /datacenter/dtr/2.0/install/ + title: Install Docker Trusted Registry + - path: /datacenter/dtr/2.0/install/install-dtr-offline/ + title: Install offline + - path: /datacenter/dtr/2.0/install/license/ + title: License DTR + - sectiontitle: Upgrade + section: + - path: /datacenter/dtr/2.0/install/upgrade/upgrade-major/ + title: Upgrade from 1.4.3 + - path: /datacenter/dtr/2.0/install/upgrade/ + title: Upgrade from 2.0.0 + - path: /datacenter/dtr/2.0/install/uninstall/ + title: Uninstall + - sectiontitle: docker/dtr image reference + section: + - path: /datacenter/dtr/2.0/reference/ + title: Overview + - path: /datacenter/dtr/2.0/reference/backup/ + title: backup + - path: /datacenter/dtr/2.0/reference/dumpcerts/ + title: dumpcerts + - path: /datacenter/dtr/2.0/reference/images/ + title: images + - path: /datacenter/dtr/2.0/reference/install/ + title: install + - path: /datacenter/dtr/2.0/reference/join/ + title: join + - path: /datacenter/dtr/2.0/reference/migrate/ + title: migrate + - path: /datacenter/dtr/2.0/reference/reconfigure/ + title: reconfigure + - path: /datacenter/dtr/2.0/reference/remove/ + title: remove + - path: /datacenter/dtr/2.0/reference/restore/ + title: restore + - path: /datacenter/dtr/2.0/reference/upgrade/ + title: upgrade + - sectiontitle: Configuration + section: + - path: /datacenter/dtr/2.0/configure/configuration/ + title: Configuration overview + - path: /datacenter/dtr/2.0/configure/config-general/ + title: Configure general settings + - path: /datacenter/dtr/2.0/configure/config-security/ + title: Security configuration + - path: /datacenter/dtr/2.0/configure/config-storage/ + title: Storage configuration + - sectiontitle: Monitor and troubleshoot + section: + - path: /datacenter/dtr/2.0/monitor-troubleshoot/ + title: Monitor DTR + - path: /datacenter/dtr/2.0/monitor-troubleshoot/troubleshoot/ + title: Troubleshoot DTR + - sectiontitle: High-availability + section: + - path: /datacenter/dtr/2.0/high-availability/ + title: Set up high availability + - path: /datacenter/dtr/2.0/high-availability/backups-and-disaster-recovery/ + title: Backups and disaster recovery + - sectiontitle: User management + section: + - path: /datacenter/dtr/2.0/user-management/ + title: Authentication and authorization + - path: /datacenter/dtr/2.0/user-management/create-and-manage-users/ + title: Create and manage users + - path: /datacenter/dtr/2.0/user-management/create-and-manage-orgs/ + title: Create and manage organizations + - path: /datacenter/dtr/2.0/user-management/create-and-manage-teams/ + title: Create and manage teams + - path: /datacenter/dtr/2.0/user-management/permission-levels/ + title: Permission levels + - sectiontitle: Repositories and images + section: + - path: /datacenter/dtr/2.0/repos-and-images/ + title: Configure your Docker Engine + - path: /datacenter/dtr/2.0/repos-and-images/pull-an-image/ + title: Pull an image + - path: /datacenter/dtr/2.0/repos-and-images/push-an-image/ + title: Push an image + - path: /datacenter/dtr/2.0/repos-and-images/delete-an-image/ + title: Delete an image + - sectiontitle: DTR APIs + section: + - path: /apidocs/overview/ + title: Overview + - path: /apidocs/v1.3.3/ + title: v1.3.3 API + - path: /apidocs/v1.4.0/ + title: v1.4.0 API + - path: /apidocs/v2.0.0/ + title: v2.0.0 API + - path: /apidocs/v2.0.1/ + title: v2.0.1 API + - sectiontitle: Release notes + section: + - path: /datacenter/dtr/2.0/release-notes/ + title: Trusted Registry release notes + - path: /datacenter/dtr/2.0/release-notes/prior-release-notes/ + title: Prior Trusted Registry release notes + - path: /datacenter/dtr/2.0/support/ + title: Get support path: /docsarchive/ diff --git a/_includes/noindex.html b/_includes/noindex.html new file mode 100644 index 0000000000..f5105bd8c7 --- /dev/null +++ b/_includes/noindex.html @@ -0,0 +1 @@ + diff --git a/_includes/tree.html b/_includes/tree.html index 94727832d7..6adacc83f8 100644 --- a/_includes/tree.html +++ b/_includes/tree.html @@ -1,4 +1,4 @@ -{% for item in tree %}{% if item.heading %}{% else %}{% if item.sectiontitle %}