From dbe6c82173efa7f36c1ccf3c83968af61d2df4f3 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 27 Jan 2015 11:22:53 -0800 Subject: Merge pull request #10113 from imreFitos/master docs: remove NAT rule when removing bridge (cherry picked from commit e04cc93a2c92638bb00af8bae8f5a165ed036bfa) Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: SvenDowideit) --- docs/sources/articles/networking.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/sources/articles/networking.md b/docs/sources/articles/networking.md index 07c70566cb..c1be570a4d 100644 --- a/docs/sources/articles/networking.md +++ b/docs/sources/articles/networking.md @@ -463,6 +463,7 @@ stopping the service and removing the interface: $ sudo service docker stop $ sudo ip link set dev docker0 down $ sudo brctl delbr docker0 + $ sudo iptables -t nat -F POSTROUTING Then, before starting the Docker service, create your own bridge and give it whatever configuration you want. Here we will create a simple @@ -489,6 +490,15 @@ illustrate the technique. $ echo 'DOCKER_OPTS="-b=bridge0"' >> /etc/default/docker $ sudo service docker start + # Confirming new outgoing NAT masquerade is set up + + $ sudo iptables -t nat -L -n + ... + Chain POSTROUTING (policy ACCEPT) + target prot opt source destination + MASQUERADE all -- 192.168.5.0/24 0.0.0.0/0 + + The result should be that the Docker server starts successfully and is now prepared to bind containers to the new bridge. After pausing to verify the bridge's configuration, try creating a container — you will -- cgit v1.2.1 From 6ffb767df084bc0ed2b6b459a5441a34dfb9e819 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Tue, 27 Jan 2015 18:25:55 -0500 Subject: Merge pull request #10373 from chenhanxiao/docker-build-typo docs: fix a typo in docker-build man page (cherry picked from commit b2b284b5cdb1df2bbde896bff6dbbe87a8853a71) Docker-DCO-1.1-Signed-off-by: James Turnbull (github: SvenDowideit) --- docs/man/docker-build.1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/man/docker-build.1.md b/docs/man/docker-build.1.md index a310df52bc..081be958b1 100644 --- a/docs/man/docker-build.1.md +++ b/docs/man/docker-build.1.md @@ -54,7 +54,7 @@ as context. # EXAMPLES -## Building an image using a Dockefile located inside the current directory +## Building an image using a Dockerfile located inside the current directory Docker images can be built using the build command and a Dockerfile: -- cgit v1.2.1 From 042da0f990670befce4a7cdf729833be062ee707 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Tue, 27 Jan 2015 18:35:16 -0500 Subject: Merge pull request #10369 from mcfiredrill/etc-host-typo fix /etc/host typo in remote API docs (cherry picked from commit 3ac5596fe05a910a91f021de10b2c6cd16eacb07) Conflicts: docs/sources/reference/api/docker_remote_api_v1.17.md Docker-DCO-1.1-Signed-off-by: James Turnbull (github: SvenDowideit) --- docs/sources/reference/api/docker_remote_api_v1.15.md | 2 +- docs/sources/reference/api/docker_remote_api_v1.16.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sources/reference/api/docker_remote_api_v1.15.md b/docs/sources/reference/api/docker_remote_api_v1.15.md index 229a05b1b4..47fe21e92e 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.15.md +++ b/docs/sources/reference/api/docker_remote_api_v1.15.md @@ -222,7 +222,7 @@ Json Parameters: - **Dns** - A list of dns servers for the container to use. - **DnsSearch** - A list of DNS search domains - **ExtraHosts** - A list of hostnames/IP mappings to be added to the - container's `/etc/host` file. Specified in the form `["hostname:IP"]`. + container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`. - **VolumesFrom** - A list of volumes to inherit from another container. Specified in the form `[:]` - **CapAdd** - A list of kernel capabilties to add to the container. diff --git a/docs/sources/reference/api/docker_remote_api_v1.16.md b/docs/sources/reference/api/docker_remote_api_v1.16.md index c701a58bf0..9934ab7716 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.16.md +++ b/docs/sources/reference/api/docker_remote_api_v1.16.md @@ -222,7 +222,7 @@ Json Parameters: - **Dns** - A list of dns servers for the container to use. - **DnsSearch** - A list of DNS search domains - **ExtraHosts** - A list of hostnames/IP mappings to be added to the - container's `/etc/host` file. Specified in the form `["hostname:IP"]`. + container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`. - **VolumesFrom** - A list of volumes to inherit from another container. Specified in the form `[:]` - **CapAdd** - A list of kernel capabilties to add to the container. -- cgit v1.2.1 From 14c5aec6328af0480ab5e54c950e7192b2a09834 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Tue, 27 Jan 2015 20:29:25 -0500 Subject: Merge pull request #10399 from SvenDowideit/add-registry-mirror-doc Add the registry mirror document to the menu (cherry picked from commit 196cdf145032f64c0b45cf4f3bd87193cfa8d124) Docker-DCO-1.1-Signed-off-by: James Turnbull (github: SvenDowideit) --- docs/mkdocs.yml | 1 + docs/sources/articles.md | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 docs/sources/articles.md diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 6a57ed21d4..17f67a4aca 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -86,6 +86,7 @@ pages: - ['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'] diff --git a/docs/sources/articles.md b/docs/sources/articles.md deleted file mode 100644 index 37f2cd80f1..0000000000 --- a/docs/sources/articles.md +++ /dev/null @@ -1,15 +0,0 @@ -# Articles - - - [Docker Basics](basics/) - - [Docker Security](security/) - - [Running the Docker daemon with HTTPS](https/) - - [Configure Networking](networking/) - - [Using Supervisor with Docker](using_supervisord/) - - [Process Management with CFEngine](cfengine_process_management/) - - [Using Puppet](puppet/) - - [Create a Base Image](baseimages/) - - [Runtime Metrics](runmetrics/) - - [Automatically Start Containers](host_integration/) - - [Link via an Ambassador Container](ambassador_pattern_linking/) - - [Increase a Boot2Docker Volume](b2d_volume_resize/) - - [Run a Local Registry Mirror](registry_mirror/) -- cgit v1.2.1 From b9243b08a52191400bc10595c82b8c08b6deeb13 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 28 Jan 2015 11:55:09 +1000 Subject: Merge pull request #10374 from SvenDowideit/add-ip-range-for-webhooks tell users they can what IP range Hub webhooks can come from so they can... (cherry picked from commit de52a1998dbec1b5a7f9e27bcf527971b8df3666) Docker-DCO-1.1-Signed-off-by: Sven Dowideit (github: SvenDowideit) --- docs/sources/docker-hub/builds.md | 4 ++++ docs/sources/docker-hub/repos.md | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/sources/docker-hub/builds.md b/docs/sources/docker-hub/builds.md index 5d73e4aae9..8b914fa10c 100644 --- a/docs/sources/docker-hub/builds.md +++ b/docs/sources/docker-hub/builds.md @@ -278,6 +278,10 @@ Webhooks are available under the Settings menu of each Repository. > **Note:** If you want to test your webhook out we recommend using > a tool like [requestb.in](http://requestb.in/). +> **Note**: The Docker Hub servers are currently in the IP range +> `162.242.195.64 - 162.242.195.127`, so you can restrict your webhooks to +> accept webhook requests from that set of IP addresses. + ### Webhook chains Webhook chains allow you to chain calls to multiple services. For example, diff --git a/docs/sources/docker-hub/repos.md b/docs/sources/docker-hub/repos.md index 0749c0814c..2bb75f0b73 100644 --- a/docs/sources/docker-hub/repos.md +++ b/docs/sources/docker-hub/repos.md @@ -105,9 +105,6 @@ Settings page. A webhook is called only after a successful `push` is made. The webhook calls are HTTP POST requests with a JSON payload similar to the example shown below. -> **Note:** For testing, you can try an HTTP request tool like -> [requestb.in](http://requestb.in/). - *Example webhook JSON payload:* ``` @@ -141,6 +138,13 @@ new updates to your images and repositories. To get started adding webhooks, go to the desired repo in the Hub, and click "Webhooks" under the "Settings" box. +> **Note:** For testing, you can try an HTTP request tool like +> [requestb.in](http://requestb.in/). + +> **Note**: The Docker Hub servers are currently in the IP range +> `162.242.195.64 - 162.242.195.127`, so you can restrict your webhooks to +> accept webhook requests from that set of IP addresses. + ### Webhook chains Webhook chains allow you to chain calls to multiple services. For example, -- cgit v1.2.1