@@ -4,21 +4,10 @@ MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)

 # To get the git info for this repo

 COPY . /src

-COPY . /docs/content/engine/

+COPY . /docs/content/

-# Sed to process GitHub Markdown

-# 1-2 Remove comment code from metadata block

-# 3 Remove .md extension from link text

-# 4 Change ](/ to ](/project/ in links

-# 5 Change ](word) to ](/project/word)

-# 6 Change ](../../ to ](/project/

-# 7 Change ](../ to ](/project/word)

-# 

-# 

-RUN find /docs/content/engine -type f -name "*.md" -exec sed -i.old \

-    -e '/^<!.*metadata]>/g' \

-    -e '/^<!.*end-metadata.*>/g' \

-    -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g' \

-    -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/engine\//g' \

-    -e 's/\(\][(]\)\([A-z]*[)]\)/\]\(\/engine\/\2/g' \

-    -e 's/\(\][(]\)\(\.\.\/\)/\1\/engine\//g' {} \;

+WORKDIR /docs/content

+

+RUN /docs/content/touch-up.sh

+

+WORKDIR /docs

@@ -47,7 +47,9 @@ image cache.

 > characters of the full image ID - which can be found using

 > `docker inspect` or `docker images --no-trunc=true`.

-{{ include "no-remote-sudo.md" }}

+> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 

+> then _do not_ type the `sudo` before the `docker` commands shown in the

+> documentation's examples.

 ## Running an interactive shell

@@ -4,7 +4,8 @@ title = "Using certificates for repository client verification"

 description = "How to set up and use certificates with a registry to verify access"

 keywords = ["Usage, registry, repository, client, root, certificate, docker, apache, ssl, tls, documentation, examples, articles,  tutorials"]

 [menu.main]

-parent = "smn_registry"

+parent = "mn_docker_hub"

+weight = 7

 +++

 <![end-metadata]-->

@@ -4,7 +4,8 @@ title = "Run a local registry mirror"

 description = "How to set up and run a local registry mirror"

 keywords = ["docker, registry, mirror,  examples"]

 [menu.main]

-parent = "smn_registry"

+parent = "mn_docker_hub"

+weight = 8

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "Docker Hub accounts"

 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs,  documentation"]

 [menu.main]

 parent = "smn_pubhub"

+weight = 1

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "Docker Hub Automated Builds"

 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation, trusted, builds, trusted builds,  automated builds"]

 [menu.main]

 parent = "smn_pubhub"

+weight = 3

 +++

 <![end-metadata]-->

@@ -1,5 +1,6 @@

 <!--[metadata]>

 +++

+draft = true

 title = "The Docker Hub Registry help"

 description = "The Docker Registry help documentation home"

 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs,  documentation"]

@@ -1,6 +1,6 @@

 <!--[metadata]>

 +++

-title = "The Docker Hub help"

+title = "The Docker Hub"

 description = "The Docker Help documentation home"

 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation, accounts, organizations, repositories,  groups"]

 [menu.main]

@@ -5,6 +5,7 @@ description = "Guidelines for Official Repositories on Docker Hub"

 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, official, image,  documentation"]

 [menu.main]

 parent = "smn_pubhub"

+weight = 4

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "Your Repositories on Docker Hub"

 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, webhooks, docs,  documentation"]

 [menu.main]

 parent = "smn_pubhub"

+weight = 2

 +++

 <![end-metadata]-->

@@ -4,7 +4,7 @@ title = "Dockerizing a CouchDB service"

 description = "Sharing data between 2 couchdb databases"

 keywords = ["docker, example, package installation, networking, couchdb,  data volumes"]

 [menu.main]

-parent = "smn_remoteapi"

+parent = "smn_applied"

 +++

 <![end-metadata]-->

deleted file mode 100644

@@ -1,3 +0,0 @@

-> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 

-> then _do not_ type the `sudo` before the `docker` commands shown in the

-> documentation's examples.

@@ -14,7 +14,7 @@ You can install Docker using Boot2Docker to run `docker` commands at your comman

 Choose this installation if you are familiar with the command-line or plan to

 contribute to the Docker project on GitHub.

-[<img src="/engine/installation/images/kitematic.png" alt="Download Kitematic"

+[<img src="/installation/images/kitematic.png" alt="Download Kitematic"

 style="float:right;">](https://kitematic.com/download)

 Alternatively, you may want to try <a id="inlinelink" href="https://kitematic.com/"

@@ -355,4 +355,4 @@ at  [Boot2Docker repository](https://github.com/boot2docker/boot2docker).

 Thanks to Chris Jones whose [blog](http://viget.com/extend/how-to-use-docker-on-os-x-the-missing-guide)  

 inspired me to redo this page.

-Continue with the [Docker User Guide](/userguide/).

+Continue with the [Docker User Guide](/userguide).

@@ -8,7 +8,7 @@ parent = "smn_linux"

 +++

 <![end-metadata]-->

-#Ubuntu

+# Ubuntu

 Docker is supported on these Ubuntu operating systems:

@@ -53,7 +53,9 @@ is developed, you can launch only Linux containers from your Windows machine.

 ## Running Docker

-{{ include "no-remote-sudo.md" }}

+> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 

+> then _do not_ type the `sudo` before the `docker` commands shown in the

+> documentation's examples.

 **Boot2Docker Start** will automatically start a shell with environment variables

 correctly set so you can start using Docker right away:

@@ -36,7 +36,9 @@ Windows*](../installation/windows/#windows) installation guides. The small Linux

 distribution boot2docker can be run inside virtual machines on these two

 operating systems.

-{{ include "no-remote-sudo.md" }}

+> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 

+> then _do not_ type the `sudo` before the `docker` commands shown in the

+> documentation's examples.

 ### How do containers compare to virtual machines?

@@ -1,12 +1,10 @@

 <!--[metadata]>

 +++

-draft = true

-title = "Get started with Docker"

+title = "About Docker"

 description = "Introduction to Docker."

 keywords = ["docker, introduction, documentation, about, technology, understanding,  Dockerfile"]

 [menu.main]

 parent = "mn_use_docker"

-weight = 1

 +++

 <![end-metadata]-->

deleted file mode 100644

@@ -1,230 +0,0 @@

-site_name: Docker Documentation

-#site_url: https://docs.docker.com/

-site_url: /

-site_description: Documentation for fast and lightweight Docker container based virtualization framework.

-site_favicon: img/favicon.png

-

-dev_addr: '0.0.0.0:8000'

-

-repo_url: https://github.com/docker/docker/

-

-docs_dir: sources

-

-include_search: true

-

-use_absolute_urls: true

-

-# theme: docker

-theme_dir: ./theme/mkdocs/

-theme_center_lead: false

-

-copyright: Copyright © 2014-2015, Docker, Inc.

-google_analytics: ['UA-6096819-11', 'docker.io']

-

-pages:

-

-# Introduction:

-- ['index.md', 'About', 'Docker']

-- ['introduction/understanding-docker.md', 'About', 'Understanding Docker']

-- ['release-notes.md', 'About', 'Release notes']

-- ['reference/glossary.md', 'About', 'Glossary']

-- ['introduction/index.md', '**HIDDEN**']

-

-

-# Installation:

-- ['installation/index.md', '**HIDDEN**']

-- ['installation/ubuntulinux.md', 'Installation', 'Ubuntu']

-- ['installation/mac.md', 'Installation', 'Mac OS X']

-- ['kitematic/index.md', 'Installation', 'Kitematic on OS X']

-- ['installation/windows.md', 'Installation', 'Microsoft Windows']

-- ['installation/testing-windows-docker-client.md', 'Installation', 'Building and testing the Windows Docker client']

-- ['installation/amazon.md', 'Installation', 'Amazon EC2']

-- ['installation/archlinux.md', 'Installation', 'Arch Linux']

-- ['installation/binaries.md', 'Installation', 'Binaries']

-- ['installation/centos.md', 'Installation', 'CentOS']

-- ['installation/cruxlinux.md', 'Installation', 'CRUX Linux']

-- ['installation/debian.md', 'Installation', 'Debian']

-- ['installation/fedora.md', 'Installation', 'Fedora']

-- ['installation/frugalware.md', 'Installation', 'FrugalWare']

-- ['installation/google.md', 'Installation', 'Google Cloud Platform']

-- ['installation/gentoolinux.md', 'Installation', 'Gentoo']

-- ['installation/softlayer.md', 'Installation', 'IBM Softlayer']

-- ['installation/joyent.md', 'Installation', 'Joyent Compute Service']

-- ['installation/azure.md', 'Installation', 'Microsoft Azure']

-- ['installation/rackspace.md', 'Installation', 'Rackspace Cloud']

-- ['installation/rhel.md', 'Installation', 'Red Hat Enterprise Linux']

-- ['installation/oracle.md', 'Installation', 'Oracle Linux']

-- ['installation/SUSE.md', 'Installation', 'SUSE']

-- ['compose/install.md', 'Installation', 'Docker Compose']

-

-# User Guide:

-- ['userguide/index.md', 'User Guide', 'The Docker user guide' ]

-- ['userguide/dockerhub.md', 'User Guide', 'Getting started with Docker Hub' ]

-- ['userguide/dockerizing.md', 'User Guide', 'Dockerizing applications' ]

-- ['userguide/usingdocker.md', 'User Guide', 'Working with containers' ]

-- ['userguide/dockerimages.md', 'User Guide', 'Working with Docker images' ]

-- ['userguide/dockerlinks.md', 'User Guide', 'Linking containers together' ]

-- ['userguide/dockervolumes.md', 'User Guide', 'Managing data in containers' ]

-- ['userguide/labels-custom-metadata.md', 'User Guide', 'Apply custom metadata' ]

-- ['userguide/dockerrepos.md', 'User Guide', 'Working with Docker Hub' ]

-- ['userguide/level1.md', '**HIDDEN**' ]

-- ['userguide/level2.md', '**HIDDEN**' ]

-- ['compose/index.md', 'User Guide', 'Docker Compose' ]

-- ['compose/production.md', 'User Guide', '    ▪  Use Compose in production' ]

-- ['compose/extends.md', 'User Guide', '    ▪  Extend Compose services' ]

-- ['machine/index.md', 'User Guide', 'Docker Machine' ]

-- ['swarm/index.md', 'User Guide', 'Docker Swarm' ]

-- ['kitematic/userguide.md', 'User Guide', 'Kitematic']

-

-# Docker Hub docs:

-- ['docker-hub/index.md', 'Docker Hub', 'Docker Hub' ]

-- ['docker-hub/accounts.md', 'Docker Hub', 'Accounts']

-- ['docker-hub/userguide.md', 'Docker Hub', 'User Guide']

-- ['docker-hub/repos.md', 'Docker Hub', 'Your Repositories']

-- ['docker-hub/builds.md', 'Docker Hub', 'Automated Builds']

-- ['docker-hub/official_repos.md', 'Docker Hub', 'Official Repositories']

-

-# Docker Hub Enterprise:

-- ['docker-hub-enterprise/index.md', 'Docker Hub Enterprise', 'Overview' ]

-- ['docker-hub-enterprise/quick-start.md', 'Docker Hub Enterprise', 'Quick Start: Basic Workflow' ]

-- ['docker-hub-enterprise/userguide.md', 'Docker Hub Enterprise', 'User Guide' ]

-- ['docker-hub-enterprise/adminguide.md', 'Docker Hub Enterprise', 'Admin Guide' ]

-- ['docker-hub-enterprise/install.md', 'Docker Hub Enterprise', '  Installation' ]

-- ['docker-hub-enterprise/configuration.md', 'Docker Hub Enterprise', '  Configuration options' ]

-- ['docker-hub-enterprise/support.md', 'Docker Hub Enterprise', 'Support' ]

-- ['docker-hub-enterprise/release-notes.md', 'Docker Hub Enterprise', 'Release notes' ]

-

-# Examples:

-- ['examples/index.md', '**HIDDEN**']

-- ['examples/nodejs_web_app.md', 'Examples', 'Dockerizing a Node.js web application']

-- ['examples/mongodb.md', 'Examples', 'Dockerizing MongoDB']

-- ['examples/running_redis_service.md', 'Examples', 'Dockerizing a Redis service']

-- ['examples/postgresql_service.md', 'Examples', 'Dockerizing a PostgreSQL service']

-- ['examples/running_riak_service.md', 'Examples', 'Dockerizing a Riak service']

-- ['examples/running_ssh_service.md', 'Examples', 'Dockerizing an SSH service']

-- ['examples/couchdb_data_volumes.md', 'Examples', 'Dockerizing a CouchDB service']

-- ['examples/apt-cacher-ng.md', 'Examples', 'Dockerizing an Apt-Cacher-ng service']

-- ['compose/django.md', 'Examples', 'Getting started with Compose and Django']

-- ['compose/rails.md', 'Examples', 'Getting started with Compose and Rails']

-- ['compose/wordpress.md', 'Examples', 'Getting started with Compose and Wordpress']

-- ['kitematic/minecraft-server.md', 'Examples', 'Kitematic: Minecraft server']

-- ['kitematic/nginx-web-server.md', 'Examples', 'Kitematic: Ngnix web server']

-- ['kitematic/rethinkdb-dev-database.md', 'Examples', 'Kitematic: RethinkDB development database']

-

-# Articles

-- ['articles/index.md', '**HIDDEN**']

-- ['articles/basics.md', 'Articles', 'Docker basics']

-- ['articles/networking.md', 'Articles', 'Advanced networking']

-- ['articles/security.md', 'Articles', 'Security']

-- ['articles/https.md', 'Articles', 'Running Docker with HTTPS']

-- ['articles/registry_mirror.md', 'Articles', 'Run a local registry mirror']

-- ['articles/host_integration.md', 'Articles', 'Automatically starting containers']

-- ['articles/baseimages.md', 'Articles', 'Creating a base image']

-- ['articles/dockerfile_best-practices.md', 'Articles', 'Best practices for writing Dockerfiles']

-- ['articles/certificates.md', 'Articles', 'Using certificates for repository client verification']

-- ['articles/using_supervisord.md', 'Articles', 'Using Supervisor']

-- ['articles/configuring.md', 'Articles', 'Configuring Docker']

-- ['articles/cfengine_process_management.md', 'Articles', 'Process management with CFEngine']

-- ['articles/puppet.md', 'Articles', 'Using Puppet']

-- ['articles/chef.md', 'Articles', 'Using Chef']

-- ['articles/dsc.md', 'Articles', 'Using PowerShell DSC']

-- ['articles/ambassador_pattern_linking.md', 'Articles', 'Cross-Host linking using ambassador containers']

-- ['articles/runmetrics.md', 'Articles', 'Runtime metrics']

-- ['articles/b2d_volume_resize.md', 'Articles', 'Increasing a Boot2Docker volume']

-- ['articles/systemd.md', 'Articles', 'Controlling and configuring Docker using Systemd']

-

-# Reference

-- ['reference/index.md', '**HIDDEN**']

-- ['reference/commandline/index.md', '**HIDDEN**']

-- ['reference/commandline/cli.md', 'Reference', 'Docker command line']

-- ['reference/builder.md', 'Reference', 'Dockerfile']

-- ['faq.md', 'Reference', 'FAQ']

-- ['reference/run.md', 'Reference', 'Run reference']

-- ['reference/logging/journald.md', '**HIDDEN**']

-- ['compose/cli.md', 'Reference', 'Compose command line']

-- ['compose/yml.md', 'Reference', 'Compose yml']

-- ['compose/env.md', 'Reference', 'Compose ENV variables']

-- ['compose/completion.md', 'Reference', 'Compose commandline completion']

-- ['swarm/discovery.md', 'Reference', 'Swarm discovery']

-- ['swarm/scheduler/strategy.md', 'Reference', 'Swarm strategies']

-- ['swarm/scheduler/filter.md', 'Reference', 'Swarm filters']

-- ['swarm/API.md', 'Reference', 'Swarm API']

-- ['reference/api/index.md', '**HIDDEN**']

-- ['registry/index.md', 'Reference', 'Docker Registry 2.0']

-- ['registry/deploying.md', 'Reference', '    ▪  Deploy a registry' ]

-- ['registry/configuration.md', 'Reference', '    ▪  Configure a registry' ]

-- ['registry/storagedrivers.md', 'Reference', '    ▪  Storage driver model' ]

-- ['registry/notifications.md', 'Reference', '    ▪  Work with notifications' ]

-- ['registry/spec/api.md', 'Reference', '    ▪  Registry Service API v2' ]

-- ['registry/spec/json.md', 'Reference', '    ▪  JSON format' ]

-- ['registry/spec/auth/token.md', 'Reference', '    ▪  Authenticate via central service' ]

-- ['reference/api/hub_registry_spec.md', 'Reference', 'Docker Hub and Registry 1.0']

-- ['reference/api/registry_api.md', 'Reference', '    ▪ Docker Registry API v1']

-- ['reference/api/registry_api_client_libraries.md', 'Reference', '    ▪ Docker Registry 1.0 API client libraries']

-#- ['reference/image-spec-v1.md', 'Reference', 'Docker Image Specification v1.0.0']

-- ['reference/api/docker-io_api.md', 'Reference', 'Docker Hub API']

-#- ['reference/image-spec-v1.md', 'Reference', 'Docker Image Specification v1.0.0']

-- ['reference/api/docker_remote_api.md', 'Reference', 'Docker Remote API']

-- ['reference/api/docker_remote_api_v1.20.md', 'Reference', 'Docker Remote API v1.20']

-- ['reference/api/docker_remote_api_v1.19.md', 'Reference', 'Docker Remote API v1.19']

-- ['reference/api/docker_remote_api_v1.18.md', 'Reference', 'Docker Remote API v1.18']

-- ['reference/api/docker_remote_api_v1.17.md', 'Reference', 'Docker Remote API v1.17']

-- ['reference/api/docker_remote_api_v1.16.md', 'Reference', 'Docker Remote API v1.16']

-- ['reference/api/docker_remote_api_v1.15.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.14.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.13.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.12.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.11.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.10.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.9.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.8.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.7.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.6.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.5.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.4.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.3.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.2.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.1.md', '**HIDDEN**']

-- ['reference/api/docker_remote_api_v1.0.md', '**HIDDEN**']

-- ['reference/api/remote_api_client_libraries.md', 'Reference', 'Docker Remote API client libraries']

-- ['reference/api/docker_io_accounts_api.md', 'Reference', 'Docker Hub accounts API']

-- ['kitematic/faq.md', 'Reference', 'Kitematic: FAQ']

-- ['kitematic/known-issues.md', 'Reference', 'Kitematic: Known issues']

-

-# Hidden registry files

-- ['registry/storage-drivers/azure.md', '**HIDDEN**' ]

-- ['registry/storage-drivers/filesystem.md', '**HIDDEN**' ]

-- ['registry/storage-drivers/inmemory.md', '**HIDDEN**' ]

-- ['registry/storage-drivers/s3.md', '**HIDDEN**' ]

-

-- ['jsearch.md', '**HIDDEN**']

-

-# - ['static_files/README.md', 'static_files', 'README']

-- ['terms/index.md', '**HIDDEN**']

-- ['terms/layer.md', '**HIDDEN**']

-- ['terms/index.md', '**HIDDEN**']

-- ['terms/registry.md', '**HIDDEN**']

-- ['terms/container.md', '**HIDDEN**']

-- ['terms/repository.md', '**HIDDEN**']

-- ['terms/filesystem.md', '**HIDDEN**']

-- ['terms/image.md', '**HIDDEN**']

-

-

-# Project:

-- ['project/index.md', '**HIDDEN**']

-- ['project/who-written-for.md', 'Contributor', 'README first']

-- ['project/software-required.md', 'Contributor', 'Get required software for Linux or OS X'] 

-- ['project/software-req-win.md', 'Contributor', 'Get required software for Windows']

-- ['project/set-up-git.md', 'Contributor', 'Configure Git for contributing'] 

-- ['project/set-up-dev-env.md', 'Contributor', 'Work with a development container'] 

-- ['project/test-and-docs.md', 'Contributor', 'Run tests and test documentation']

-- ['project/make-a-contribution.md', 'Contributor', 'Understand contribution workflow']

-- ['project/find-an-issue.md', 'Contributor', 'Find an issue'] 

-- ['project/work-issue.md', 'Contributor', 'Work on an issue'] 

-- ['project/create-pr.md', 'Contributor', 'Create a pull request'] 

-- ['project/review-pr.md', 'Contributor', 'Participate in the PR review'] 

-- ['project/advanced-contributing.md', 'Contributor', 'Advanced contributing']

-- ['project/get-help.md', 'Contributor', 'Where to get help']

-- ['project/coding-style.md', 'Contributor', 'Coding style guide']

-- ['project/doc-style.md', 'Contributor', 'Documentation style guide']

-

@@ -5,6 +5,7 @@ description = "Explains workflows for refactor and design proposals"

 keywords = ["contribute, project, design, refactor,  proposal"]

 [menu.main]

 parent = "smn_contribute"

+weight=6

 +++

 <![end-metadata]-->

@@ -4,7 +4,8 @@ title = "Coding style checklist"

 description = "List of guidelines for coding Docker contributions"

 keywords = ["change, commit, squash, request, pull request, test, unit test, integration tests, Go, gofmt,  LGTM"]

 [menu.main]

-parent = "mn_opensource"

+parent = "smn_contribute"

+weight=7

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "Basic workflow for Docker contributions"

 keywords = ["contribute, pull request, review, workflow, beginner, squash,  commit"]

 [menu.main]

 parent = "smn_contribute"

+weight=4

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "Style guide for Docker documentation describing standards and con

 keywords = ["style, guide, docker,  documentation"]

 [menu.main]

 parent = "mn_opensource"

+weight=100

 +++

 <![end-metadata]-->

@@ -1,10 +1,11 @@

 <!--[metadata]>

 +++

-title = "Make a project contribution"

+title = "Find and claim an issue"

 description = "Basic workflow for Docker contributions"

-keywords = ["contribute, pull request, review, workflow, beginner, expert, squash,  commit"]

+keywords = ["contribute, issue, review, workflow, beginner, expert, squash,  commit"]

 [menu.main]

 parent = "smn_contribute"

+weight=2

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "Basic workflow for Docker contributions"

 keywords = ["contribute, pull request, review, workflow, beginner, squash,  commit"]

 [menu.main]

 parent = "smn_contribute"

+weight=5

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "How to use Docker's development environment"

 keywords = ["development, inception, container, image Dockerfile, dependencies, Go,  artifacts"]

 [menu.main]

 parent = "smn_develop"

+weight=5

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "Describes how to set up your local machine and repository"

 keywords = ["GitHub account, repository, clone, fork, branch, upstream, Git, Go, make "]

 [menu.main]

 parent = "smn_develop"

+weight=4

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "How to set up a server to test Docker Windows client"

 keywords = ["development, inception, container, image Dockerfile, dependencies, Go, artifacts,  windows"]

 [menu.main]

 parent = "smn_develop"

+weight=3

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "Describes the software required to contribute to Docker"

 keywords = ["GitHub account, repository, Docker, Git, Go, make,  "]

 [menu.main]

 parent = "smn_develop"

+weight=2

 +++

 <![end-metadata]-->

@@ -4,7 +4,8 @@ title = "Run tests and test documentation"

 description = "Describes Docker's testing infrastructure"

 keywords = ["make test, make docs, Go tests, gofmt, contributing,  running tests"]

 [menu.main]

-parent = "smn_contribute"

+parent = "smn_develop"

+weight=6

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "Basic workflow for Docker contributions"

 keywords = ["contribute, pull request, review, workflow, beginner, squash,  commit"]

 [menu.main]

 parent = "smn_contribute"

+weight=3

 +++

 <![end-metadata]-->

@@ -1,5 +1,6 @@

 <!--[metadata]>

 +++

+draft = true

 title = "Remote API v1.10"

 description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

@@ -1,5 +1,6 @@

 <!--[metadata]>

 +++

+draft = true

 title = "Remote API v1.11"

 description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

@@ -1,5 +1,6 @@

 <!--[metadata]>

 +++

+draft = true

 title = "Remote API v1.12"

 description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

@@ -1,5 +1,6 @@

 <!--[metadata]>

 +++

+draft = true

 title = "Remote API v1.13"

 description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

@@ -5,6 +5,7 @@ description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

 [menu.main]

 parent = "smn_remoteapi"

+weight = 7

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

 [menu.main]

 parent = "smn_remoteapi"

+weight = 6

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

 [menu.main]

 parent = "smn_remoteapi"

+weight = 5

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

 [menu.main]

 parent = "smn_remoteapi"

+weight = 4

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

 [menu.main]

 parent = "smn_remoteapi"

+weight = 3

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

 [menu.main]

 parent = "smn_remoteapi"

+weight = 2

 +++

 <![end-metadata]-->

@@ -5,6 +5,7 @@ description = "API Documentation for Docker"

 keywords = ["API, Docker, rcli, REST,  documentation"]

 [menu.main]

 parent="smn_remoteapi"

+weight = 1

 +++

 <![end-metadata]-->

@@ -1,14 +1,14 @@

 <!--[metadata]>

 +++

-title = "Registry documentation"

+title = "The Docker Hub and the Registry v1"

 description = "Documentation for docker Registry and Registry API"

 keywords = ["docker, registry, api,  hub"]

 [menu.main]

-parent="smn_registry_ref"

+parent="smn_hub_ref"

 +++

 <![end-metadata]-->

-# The Docker Hub and the Registry 1.0 spec

+# The Docker Hub and the Registry v1

 ## The three roles

@@ -1,6 +1,7 @@

 <!--[metadata]>

 +++

-title = "Registry API"

+draft = true

+title = "Registry v1 API"

 description = "API Documentation for Docker Registry"

 keywords = ["API, Docker, index, registry, REST,  documentation"]

 [menu.main]

@@ -1,5 +1,6 @@

 <!--[metadata]>

 +++

+draft = true

 title = "Registry API v1 client libraries"

 description = "Various client libraries available to use with the Docker registry API"

 keywords = ["API, Docker, index, registry, REST, documentation, clients, C#, Erlang, Go, Groovy, Java, JavaScript, Perl, PHP, Python, Ruby, Rust,  Scala"]

@@ -10,7 +10,9 @@ parent = "mn_reference"

 # Docker Command Line

-{{ include "no-remote-sudo.md" }}

+> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 

+> then _do not_ type the `sudo` before the `docker` commands shown in the

+> documentation's examples.

 To list available commands, either run `docker` with no parameters

 or execute `docker help`:

deleted file mode 100644

@@ -1,357 +0,0 @@

-no_version_dropdown: true

-page_title: Docker Hub Enterprise: Configuration options

-page_description: Configuration instructions for Docker Hub Enterprise

-page_keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry

-

-# Configuring DHE

-

-## Overview

-

-This page will help you properly configure Docker Hub Enterprise (DHE) so it can

-run in your environment. 

-

-Start with DHE loaded in your browser and click  the "Settings" tab to view

-configuration options. You'll see options for configuring:

-

-* Domains and ports

-* Security settings

-* Storage settings

-* Authentication settings

-* Your DHE license

-

-## Domains and Ports

-

-![Domain and Ports page</admin/settings#http>](../assets/admin-settings-http.png)

-

-* *Domain Name*: **required** defaults to an empty string, the fully qualified domain name assigned to the DHE host.

-* *Load Balancer HTTP Port*: defaults to 80, used as the entry point for the image storage service. To see load balancer status, you can query

-http://<dhe-host>/load_balancer_status.

-* *Load Balancer HTTPS Port*: defaults to 443, used as the secure entry point

-for the image storage service.

-* *HTTP_PROXY*: defaults to an empty string, proxy server for HTTP requests.

-* *HTTPS_PROXY*: defaults to an empty string, proxy server for HTTPS requests.

-* *NO_PROXY*: defaults to an empty string, proxy bypass for HTTP and HTTPS requests.

-

-

-> **Note**: If you need DHE to re-generate a self-signed certificate at some

-> point, you'll need to first delete `/usr/local/etc/dhe/ssl/server.pem`, and

-> then restart the DHE containers, either by changing and saving the "Domain Name",

-> or using `bash -c "$(docker run dockerhubenterprise/manager restart)"`.

-

-

-## Security

-

-![Security settings page</admin/settings#security>](../assets/admin-settings-security.png)

-

-* *SSL Certificate*: Used to enter the hash (string) from the SSL Certificate.

-This cert must be accompanied by its private key, entered below.

-* *Private Key*: The hash from the private key associated with the provided

-SSL Certificate (as a standard x509 key pair).

-

-In order to run, DHE requires encrypted communications via HTTPS/SSL between (a) the DHE registry and your Docker Engine(s), and (b) between your web browser and the DHE admin server. There are a few options for setting this up:

-

-1. You can use the self-signed certificate DHE generates by default.

-2. You can generate your own certificates using a public service or your enterprise's infrastructure. See the [Generating SSL certificates](#generating-ssl-certificates) section for the options available.

-

-If you are generating your own certificates, you can install them by following the instructions for

-[Adding your own registry certificates to DHE](#adding-your-own-registry-certificates-to-dhe).

-

-On the other hand, if you choose to use the DHE-generated certificates, or the

-certificates you generate yourself are not trusted by your client Docker hosts,

-you will need to do one of the following:

-

-* [Install a registry certificate on all of your client Docker daemons](#installing-registry-certificates-on-client-docker-daemons),

-

-* Set your [client Docker daemons to run with an unconfirmed connection to the registry](#if-you-cant-install-the-certificates).

-

-### Generating SSL certificates

-

-There are three basic approaches to generating certificates:

-

-1.  Most enterprises will have private key infrastructure (PKI) in place to

-generate keys. Consult with your security team or whomever manages your private

-key infrastructure. If you have this resource available, Docker recommends you

-use it.

-

-2. If your enterprise can't provide keys, you can use a public Certificate

-Authority (CA) like "InstantSSL.com" or "RapidSSL.com" to generate a

-certificate. If your certificates are generated using a globally trusted

-Certificate Authority, you won't need to install them on all of your

-client Docker daemons.

-

-3. Use the self-signed registry certificate generated by DHE, and install it

-onto the client Docker daemon hosts as shown below.

-

-### Adding your own Registry certificates to DHE

-

-Whichever method you use to generate certificates, once you have them

-you can set up your DHE server to use them by navigating to the "Settings" page,

-going to "Security," and putting the SSL Certificate text (including all

-intermediate Certificates, starting with the host) into the

-"SSL Certificate" edit box, and the previously generated Private key into

-the "SSL Private Key" edit box.

-

-Click the "Save" button, and then wait for the DHE Admin site to restart and

-reload. It should now be using the new certificate.

-

-Once the "Security" page has reloaded, it will show `#` hashes instead of the

-certificate text you pasted in.

-

-If your certificate is signed by a chain of Certificate Authorities that are

-already trusted by your Docker daemon servers, you can skip the "Installing

-registry certificates" step below.

-

-### Installing Registry certificates on client Docker daemons

-

-If your certificates do not have a trusted Certificate Authority, you will need

-to install them on each client Docker daemon host.

-

-The procedure for installing the DHE certificates on each Linux distribution has

-slightly different steps, as shown below.

-

-You can test this certificate using `curl`:

-

-```

-$ curl https://dhe.yourdomain.com/v2/

-curl: (60) SSL certificate problem: self signed certificate

-More details here: http://curl.haxx.se/docs/sslcerts.html

-

-curl performs SSL certificate verification by default, using a "bundle"

- of Certificate Authority (CA) public keys (CA certs). If the default

- bundle file isn't adequate, you can specify an alternate file

- using the --cacert option.

-If this HTTPS server uses a certificate signed by a CA represented in

- the bundle, the certificate verification probably failed due to a

- problem with the certificate (it might be expired, or the name might

- not match the domain name in the URL).

-If you'd like to turn off curl's verification of the certificate, use

- the -k (or --insecure) option.

-

-$ curl --cacert /usr/local/etc/dhe/ssl/server.pem https://dhe.yourdomain.com/v2/

-{"errors":[{"code":"UNAUTHORIZED","message":"access to the requested resource is not authorized","detail":null}]}

-```

-

-Continue by following the steps corresponding to your chosen OS.

-

-#### Ubuntu/Debian

-

-```

-    $ export DOMAIN_NAME=dhe.yourdomain.com

-    $ openssl s_client -connect $DOMAIN_NAME:443 -showcerts </dev/null 2>/dev/null | openssl x509 -outform PEM | sudo tee /usr/local/share/ca-certificates/$DOMAIN_NAME.crt

-    $ sudo update-ca-certificates

-    Updating certificates in /etc/ssl/certs... 1 added, 0 removed; done.

-    Running hooks in /etc/ca-certificates/update.d....done.

-    $ sudo service docker restart

-    docker stop/waiting

-    docker start/running, process 29291

-```

-

-#### RHEL

-

-```

-    $ export DOMAIN_NAME=dhe.yourdomain.com

-    $ openssl s_client -connect $DOMAIN_NAME:443 -showcerts </dev/null 2>/dev/null | openssl x509 -outform PEM | sudo tee /etc/pki/ca-trust/source/anchors/$DOMAIN_NAME.crt

-    $ sudo update-ca-trust

-    $ sudo /bin/systemctl restart docker.service

-```

-