From 9fd3cf4cad505eb059a5a883dd3ece60ddb4ab6c Mon Sep 17 00:00:00 2001 From: Jared Carlson Date: Sat, 8 Oct 2016 16:46:50 -0600 Subject: [PATCH 01/13] Fixed Issue #128 - Syntax Error in: opensource/workflow/find-an-issue.md --> I removed the extra table heading tag I found on line 113 Signed-off-by: Jared Carlson --- opensource/workflow/find-an-issue.md | 1 - 1 file changed, 1 deletion(-) diff --git a/opensource/workflow/find-an-issue.md b/opensource/workflow/find-an-issue.md index 6fc27d625e..fdee2cc90c 100644 --- a/opensource/workflow/find-an-issue.md +++ b/opensource/workflow/find-an-issue.md @@ -110,7 +110,6 @@ The following table describes the kind labels. The following table describes the experience level guidelines. - From df99fe96f6f2c100fab82a91c0d73235b9659383 Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Sun, 9 Oct 2016 09:44:35 -0700 Subject: [PATCH 02/13] Fix the wrong links in opensource/code.md --- opensource/code.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/opensource/code.md b/opensource/code.md index 82ccb574f3..90b72174a6 100644 --- a/opensource/code.md +++ b/opensource/code.md @@ -28,36 +28,36 @@ If you are an experienced open source contributor you may be familiar with this workflow. If you are new or just need reminders, the steps below link to more detailed documentation in Docker's project contributors guide. -1. Get the software you need. This explains how to install a couple of tools used in our development environment. What you need (or don't need) might surprise you. -2. Configure Git and fork the repo. Your Git configuration can make it easier for you to contribute. Configuration is especially key if are new to contributing or to Docker. -3. Learn to work with the Docker development container. Docker developers run `docker` in `docker`. If you are a geek, this is a pretty cool experience. -4. Claim an issue to work on. We created a filter listing all open and unclaimed issues for Docker. 5. Work on the +href="http://docs.docker.com/opensource/workflow/work-issue/" target="_blank">Work on the issue. If you change or add code or docs to a project, you should test your changes as you work. This page explains how to + href="http://docs.docker.com/opensource/project/test-and-docs/" target="_blank">how to test in our development environment. Also, remember to always **sign your commits** as you work! To sign your @@ -68,7 +68,7 @@ issue. If you don't sign Gordon will get you! -6. Create a +6. Create a pull request. If you make a change to fix an issue, add reference to the issue in the pull @@ -81,6 +81,6 @@ pull request. needs](code.md#what-is-the-pre-pull-request-checklist). -7. Participate in the pull request review till a successful merge. From 78ff6bf07e71eac5865c4264c9946f4d74e32942 Mon Sep 17 00:00:00 2001 From: vishesh92 Date: Mon, 10 Oct 2016 17:58:48 +0530 Subject: [PATCH 03/13] fix formatting in container-communication.md fix formatting in container-communication.md so page is rendered perfectly at https://docs.docker.com/engine/userguide/networking/default_network/container-communication/ --- .../networking/default_network/container-communication.md | 1 + 1 file changed, 1 insertion(+) diff --git a/engine/userguide/networking/default_network/container-communication.md b/engine/userguide/networking/default_network/container-communication.md index 2a2ebf7ed5..e13859c5de 100644 --- a/engine/userguide/networking/default_network/container-communication.md +++ b/engine/userguide/networking/default_network/container-communication.md @@ -29,6 +29,7 @@ Docker will go set `ip_forward` to `1` for you when the server starts up. If you set `--ip-forward=false` and your system's kernel has it enabled, the `--ip-forward=false` option has no effect. To check the setting on your kernel or to turn it on manually: + ``` $ sysctl net.ipv4.conf.all.forwarding From b5ca8860b9e50712a52f9998e3e237b43ef61121 Mon Sep 17 00:00:00 2001 From: candita Date: Mon, 10 Oct 2016 11:46:51 -0400 Subject: [PATCH 04/13] Update deprecated.md Format as one sentence rather than 2 columns. --- engine/deprecated.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/deprecated.md b/engine/deprecated.md index fcbba87289..8977a780d8 100644 --- a/engine/deprecated.md +++ b/engine/deprecated.md @@ -23,7 +23,7 @@ see [Feature Deprecation Policy](index.md#feature-deprecation-policy). **Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)** -The `docker import` command format 'file|URL|- [REPOSITORY [TAG]]' is deprecated since November 2013. It's no more supported. +The `docker import` command format `file|URL|- [REPOSITORY [TAG]]` is deprecated since November 2013. It's no more supported. ### `-h` shorthand for `--help` From 220bbed0e4888c77ae343ad1f4aae12b0610cffb Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Mon, 10 Oct 2016 10:02:15 -0700 Subject: [PATCH 05/13] Fix incorrect information about swarm port assignment --- engine/swarm/key-concepts.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/engine/swarm/key-concepts.md b/engine/swarm/key-concepts.md index 302e452775..94b74dae86 100644 --- a/engine/swarm/key-concepts.md +++ b/engine/swarm/key-concepts.md @@ -74,7 +74,9 @@ run on the assigned node or fail. The swarm manager uses **ingress load balancing** to expose the services you want to make available externally to the swarm. The swarm manager can automatically assign the service a **PublishedPort** or you can configure a -PublishedPort for the service in the 30000-32767 range. +PublishedPort for the service. You can specify any unused port. If you do not +specify a port, the swarm manager assigns the service a port in the 30000-32767 +range. External components, such as cloud load balancers, can access the service on the PublishedPort of any node in the cluster whether or not the node is currently From a30aa7d320286e639c770738ba1db6f20000add1 Mon Sep 17 00:00:00 2001 From: John Mulhausen Date: Mon, 10 Oct 2016 11:41:32 -0700 Subject: [PATCH 06/13] Delete robots.txt --- robots.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 robots.txt diff --git a/robots.txt b/robots.txt deleted file mode 100644 index f4165dfbdc..0000000000 --- a/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ - -User-agent: * -Disallow: / From 6760a6a88b616f5a569a3a01021b27c2f0e1aa2b Mon Sep 17 00:00:00 2001 From: John Mulhausen Date: Mon, 10 Oct 2016 14:55:20 -0700 Subject: [PATCH 07/13] Update get-help.md --- opensource/get-help.md | 53 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/opensource/get-help.md b/opensource/get-help.md index ff8a50bca1..a0f5cc993e 100644 --- a/opensource/get-help.md +++ b/opensource/get-help.md @@ -33,7 +33,7 @@ community members and developers. -
Exp Label
Internet Relay Chat (IRC) + Internet Relay Chat (IRC)

IRC a direct line to our most knowledgeable Docker users. @@ -76,11 +76,11 @@ platforms. Using Webchat from Freenode.net is a quick and easy way to get chatting. To register: -1. In your browser open https://webchat.freenode.net +1. In your browser open https://webchat.freenode.net ![Login to webchat screen](images/irc_connect.png) -2. Fill out the form. +2. Fill out the form. @@ -97,7 +97,7 @@ register:
-3. Click on the "Connect" button. +3. Click on the "Connect" button. The browser connects you to Webchat. You'll see a lot of text. At the bottom of the Webchat web page is a command line bar. Just above the command line bar @@ -105,10 +105,12 @@ register: ![Registration needed screen](images/irc_after_login.png) -4. Register your nickname by entering the following command in the +4. Register your nickname by entering the following command in the command line bar: - /msg NickServ REGISTER yourpassword youremail@example.com + ``` + /msg NickServ REGISTER yourpassword youremail@example.com + ``` ![Registering screen](images/register_nic.png) @@ -120,14 +122,15 @@ command line bar: that you provided. This email will contain instructions for completing your registration. -5. Open your email client and look for the email. +5. Open your email client and look for the email. ![Login screen](images/register_email.png) -6. Back in the browser, complete the registration according to the email -by entering the following command into the webchat command line bar: +6. Back in the browser, complete the registration according to the email by entering the following command into the webchat command line bar: - /msg NickServ VERIFY REGISTER yournickname somecode + ``` + /msg NickServ VERIFY REGISTER yournickname somecode + ``` Your nickname is now registered to chat on freenode.net. @@ -139,24 +142,24 @@ IRCCloud is a web-based IRC client service that is hosted in the cloud. This is a Freemium product, meaning the free version is limited and you can pay for more features. To use IRCCloud: -1. Select the following link: +1. Select the following link: Join the #docker channel on chat.freenode.net The following web page is displayed in your browser: ![IRCCloud Register screen](images/irccloud-join.png) -2. If this is your first time using IRCCloud enter a valid email address in the +2. If this is your first time using IRCCloud enter a valid email address in the form. People who have already registered with IRCCloud can select the "sign in here" link. Additionally, people who are already registered with IRCCloud may have a cookie stored on their web browser that enables a quick start "let's go" link to be shown instead of the above form. In this case just select the "let's go" link and [jump ahead to start chatting](get-help.md#start-chatting) -3. After entering your email address in the form, check your email for an invite +3. After entering your email address in the form, check your email for an invite from IRCCloud and follow the instructions provided in the email. -4. After following the instructions in your email you should have an IRCCloud +4. After following the instructions in your email you should have an IRCCloud Client web page in your browser: ![IRCCloud](images/irccloud-register-nick.png) @@ -164,20 +167,24 @@ Client web page in your browser: The message shown above may appear indicating that you need to register your nickname. -5. To register your nickname enter the following message into the command line bar +5. To register your nickname enter the following message into the command line bar at the bottom of the IRCCloud Client: - /msg NickServ REGISTER yourpassword youremail@example.com + ``` + /msg NickServ REGISTER yourpassword youremail@example.com + ``` This command line bar is for chatting and entering in IRC commands. -6. Check your email for an invite to freenode.net: +6. Check your email for an invite to freenode.net: ![Login screen](images/register_email.png) -7. Back in the browser, complete the registration according to the email. +7. Back in the browser, complete the registration according to the email. - /msg NickServ VERIFY REGISTER yournickname somecode + ``` + /msg NickServ VERIFY REGISTER yournickname somecode + ``` ## Tips @@ -188,7 +195,7 @@ The procedures in this section apply to both IRC clients. Next time you return to log into chat, you may need to re-enter your password on the command line using this command: - /msg NickServ identify + /msg NickServ identify With Webchat if you forget or lose your password you'll need to join the `#freenode` channel and request them to reset it for you. @@ -198,17 +205,17 @@ With Webchat if you forget or lose your password you'll need to join the Join the `#docker` group using the following command in the command line bar of your IRC Client: - /j #docker + /j #docker You can also join the `#docker-dev` group: - /j #docker-dev + /j #docker-dev ### Start chatting To ask questions to the group just type messages in the command line bar: - ![Web Chat Screen](images/irc_chat.png) +![Web Chat Screen](images/irc_chat.png) ## Learning more about IRC From 5423de94f0cb4c0c749aeef42044dc2de73f111d Mon Sep 17 00:00:00 2001 From: Matt Bentley Date: Fri, 7 Oct 2016 13:01:47 -0400 Subject: [PATCH 08/13] Add deferred deletion to recommended dm options Signed-off-by: Matt Bentley --- engine/userguide/storagedriver/device-mapper-driver.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/engine/userguide/storagedriver/device-mapper-driver.md b/engine/userguide/storagedriver/device-mapper-driver.md index 49077d6c17..a1a372e763 100644 --- a/engine/userguide/storagedriver/device-mapper-driver.md +++ b/engine/userguide/storagedriver/device-mapper-driver.md @@ -314,10 +314,10 @@ assumes that the Docker daemon is in the `stopped` state. 14. Configure the Docker daemon with specific devicemapper options. - There are two ways to do this. You can set options on the command line if you start the daemon there: + Now that your storage is configured, configure the Docker daemon to use it. There are two ways to do this. You can set options on the command line if you start the daemon there: ```bash - --storage-driver=devicemapper --storage-opt=dm.thinpooldev=/dev/mapper/docker-thinpool --storage-opt dm.use_deferred_removal=true + --storage-driver=devicemapper --storage-opt=dm.thinpooldev=/dev/mapper/docker-thinpool --storage-opt=dm.use_deferred_removal=true --storage-opt=dm.use_deferred_deletion=true ``` You can also set them for startup in the `daemon.json` configuration, for example: @@ -327,11 +327,14 @@ assumes that the Docker daemon is in the `stopped` state. "storage-driver": "devicemapper", "storage-opts": [ "dm.thinpooldev=/dev/mapper/docker-thinpool", - "dm.use_deferred_removal=true" + "dm.use_deferred_removal=true", + "dm.use_deferred_deletion=true" ] } ``` + >**Note**: Always set both `dm.use_deferred_removal=true` and `dm.use_deferred_deletion=true` to prevent unintentionally leaking mount points. + 15. If using systemd and modifying the daemon configuration via unit or drop-in file, reload systemd to scan for changes. ```bash From bdaafb8daccbdbf8df85800679a3949a5d7bf80b Mon Sep 17 00:00:00 2001 From: John Mulhausen Date: Mon, 10 Oct 2016 15:55:09 -0700 Subject: [PATCH 09/13] Website verification --- googlecbe7fee896be512c.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 googlecbe7fee896be512c.html diff --git a/googlecbe7fee896be512c.html b/googlecbe7fee896be512c.html new file mode 100644 index 0000000000..2791770031 --- /dev/null +++ b/googlecbe7fee896be512c.html @@ -0,0 +1 @@ +google-site-verification: googlecbe7fee896be512c.html \ No newline at end of file From e916f7f88ecb9d3351448b9baed4e51ecade29fd Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Mon, 10 Oct 2016 16:19:47 -0700 Subject: [PATCH 10/13] Change 'draft: true' to 'published: false' for Jekyll --- engine/admin/b2d_volume_resize.md | 2 +- engine/reference/api/README.md | 2 +- engine/reference/api/docker-io_api.md | 2 +- engine/reference/api/docker_remote_api_v1.25.md | 2 +- engine/reference/api/hub_registry_spec.md | 2 +- engine/security/https/README.md | 2 +- engine/static_files/README.md | 2 +- machine/DRIVER_SPEC.md | 2 +- machine/RELEASE.md | 2 +- registry/architecture.md | 2 +- registry/glossary.md | 2 +- registry/migration.md | 2 +- registry/spec/implementations.md | 2 +- registry/spec/json.md | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/engine/admin/b2d_volume_resize.md b/engine/admin/b2d_volume_resize.md index 1491555f41..35e74c144e 100644 --- a/engine/admin/b2d_volume_resize.md +++ b/engine/admin/b2d_volume_resize.md @@ -1,6 +1,6 @@ --- description: Resizing a Boot2Docker volume in VirtualBox with GParted -draft: "true" +published: false keywords: - boot2docker, volume, virtualbox menu: diff --git a/engine/reference/api/README.md b/engine/reference/api/README.md index e96ccf08da..9c2c1b7407 100644 --- a/engine/reference/api/README.md +++ b/engine/reference/api/README.md @@ -1,5 +1,5 @@ --- -draft: true +published: false --- This directory holds the authoritative specifications of APIs defined and implemented by Docker. Currently this includes: diff --git a/engine/reference/api/docker-io_api.md b/engine/reference/api/docker-io_api.md index 3a172e5eb5..29010bbfbe 100644 --- a/engine/reference/api/docker-io_api.md +++ b/engine/reference/api/docker-io_api.md @@ -1,6 +1,6 @@ --- description: API Documentation for the Docker Hub API -draft: true +published: false keywords: - API, Docker, index, REST, documentation, Docker Hub, registry menu: diff --git a/engine/reference/api/docker_remote_api_v1.25.md b/engine/reference/api/docker_remote_api_v1.25.md index ec2ec480f6..4e4735ed85 100644 --- a/engine/reference/api/docker_remote_api_v1.25.md +++ b/engine/reference/api/docker_remote_api_v1.25.md @@ -1,6 +1,6 @@ --- description: API Documentation for Docker -draft: true +published: false keywords: - API, Docker, rcli, REST, documentation menu: diff --git a/engine/reference/api/hub_registry_spec.md b/engine/reference/api/hub_registry_spec.md index d19001e6d5..0227e3b4df 100644 --- a/engine/reference/api/hub_registry_spec.md +++ b/engine/reference/api/hub_registry_spec.md @@ -1,6 +1,6 @@ --- description: Documentation for docker Registry and Registry API -draft: true +published: false keywords: - docker, registry, api, hub menu: diff --git a/engine/security/https/README.md b/engine/security/https/README.md index 260aee536c..a6fbdcbf70 100644 --- a/engine/security/https/README.md +++ b/engine/security/https/README.md @@ -1,5 +1,5 @@ --- -draft: true +published: false --- This is an initial attempt to make it easier to test the examples in the https.md diff --git a/engine/static_files/README.md b/engine/static_files/README.md index 36a478ea24..3caa5d663d 100644 --- a/engine/static_files/README.md +++ b/engine/static_files/README.md @@ -1,5 +1,5 @@ --- -draft: true +published: false --- Static files dir diff --git a/machine/DRIVER_SPEC.md b/machine/DRIVER_SPEC.md index 39f26a37f3..741adebf7e 100644 --- a/machine/DRIVER_SPEC.md +++ b/machine/DRIVER_SPEC.md @@ -1,6 +1,6 @@ --- description: machine -draft: true +published: false keywords: - machine, orchestration, install, installation, docker, documentation menu: diff --git a/machine/RELEASE.md b/machine/RELEASE.md index ca43001017..8e9bd80c48 100644 --- a/machine/RELEASE.md +++ b/machine/RELEASE.md @@ -1,5 +1,5 @@ --- -draft: true +published: false --- # Docker Machine Release Process diff --git a/registry/architecture.md b/registry/architecture.md index 91b704f8c4..c2aaa9f2d7 100644 --- a/registry/architecture.md +++ b/registry/architecture.md @@ -1,5 +1,5 @@ --- -draft: true +published: false --- # Architecture diff --git a/registry/glossary.md b/registry/glossary.md index 61c8d1dc3f..2eb1626a28 100644 --- a/registry/glossary.md +++ b/registry/glossary.md @@ -1,5 +1,5 @@ --- -draft: true +published: false --- # Glossary diff --git a/registry/migration.md b/registry/migration.md index 167c5a680a..e46441cb0a 100644 --- a/registry/migration.md +++ b/registry/migration.md @@ -1,5 +1,5 @@ --- -draft: true +published: false --- # Migrating a 1.0 registry to 2.0 diff --git a/registry/spec/implementations.md b/registry/spec/implementations.md index a365db6c4a..3474653502 100644 --- a/registry/spec/implementations.md +++ b/registry/spec/implementations.md @@ -1,5 +1,5 @@ --- -draft: true +published: false --- # Distribution API Implementations diff --git a/registry/spec/json.md b/registry/spec/json.md index 8e149a34d4..e5d0d304e8 100644 --- a/registry/spec/json.md +++ b/registry/spec/json.md @@ -1,6 +1,6 @@ --- description: Explains registry JSON objects -draft: true +published: false keywords: - registry, service, images, repository, json menu: From f1bdec69ecff9dc5706e3990ebb151f7c9d71246 Mon Sep 17 00:00:00 2001 From: John Mulhausen Date: Mon, 10 Oct 2016 16:22:46 -0700 Subject: [PATCH 11/13] Create sitemap.xml --- sitemap.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 sitemap.xml diff --git a/sitemap.xml b/sitemap.xml new file mode 100644 index 0000000000..7d06dd5fbc --- /dev/null +++ b/sitemap.xml @@ -0,0 +1,18 @@ +--- +--- + + + + + https://docs.docker.com/ + {{ site.time | date_to_xmlschema }} + +{% for page in site.pages %} + https://docs.docker.com{{ page.url }} + {% if page.date %}{{ page.date | date_to_xmlschema }}{% else %}{{ site.time | date_to_xmlschema }}{% endif %} +{% endfor %} + From 4a2953dcc6531b20283c9d15fd3938a6563e3baf Mon Sep 17 00:00:00 2001 From: John Mulhausen Date: Mon, 10 Oct 2016 16:23:13 -0700 Subject: [PATCH 12/13] Update _config.yml --- _config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/_config.yml b/_config.yml index b924d4a473..1886a5b5ac 100644 --- a/_config.yml +++ b/_config.yml @@ -15,7 +15,6 @@ exclude: gems: - jekyll-redirect-from - - jekyll-sitemap - jekyll-gist defaults: From 6d4047c3e95f0e87289bc2cf5a5edecb3bdfd28d Mon Sep 17 00:00:00 2001 From: John Mulhausen Date: Mon, 10 Oct 2016 16:25:26 -0700 Subject: [PATCH 13/13] Sitemap fix --- sitemap.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sitemap.xml b/sitemap.xml index 7d06dd5fbc..901d119011 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1,4 +1,5 @@ --- +layout: null ---