From ecaf5b7eec42318ab35a8af53a1c9eac5dc6976d Mon Sep 17 00:00:00 2001 From: Nikita Potapenko Date: Thu, 26 Sep 2019 01:16:23 +0300 Subject: [PATCH 1/4] Fix typo (#9511) --- ee/ucp/admin/install/upgrade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/ucp/admin/install/upgrade.md b/ee/ucp/admin/install/upgrade.md index 5f0a64cc48..74ef44bd6f 100644 --- a/ee/ucp/admin/install/upgrade.md +++ b/ee/ucp/admin/install/upgrade.md @@ -356,4 +356,4 @@ From UCP 2.0: UCP 2.0 -> UCP 2.1 -> UCP 2.2 ## Where to go next -- [Upgrade DTR](/e/dtr/admin/upgrade/) +- [Upgrade DTR](/ee/dtr/admin/upgrade/) From 996f2e7d43b572e5b102bb82cd0ad176ddc54d2f Mon Sep 17 00:00:00 2001 From: "Jose J. Escobar" <53836904+jescobar-docker@users.noreply.github.com> Date: Wed, 25 Sep 2019 18:18:23 -0400 Subject: [PATCH 2/4] Update index.md (#9498) * Update index.md Fixed broken link. * Removed full URL --- ee/dtr/admin/install/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/dtr/admin/install/index.md b/ee/dtr/admin/install/index.md index 23f2147dec..08ded7ce95 100644 --- a/ee/dtr/admin/install/index.md +++ b/ee/dtr/admin/install/index.md @@ -79,7 +79,7 @@ the install command on. DTR will be installed on the UCP worker defined by the automatically reconfigured to trust DTR. * With DTR 2.7, you can [enable browser authentication via client - certificates](/ee/enable-authentication-via-client-certificates/) at install + certificates](/ee/enable-client-certificate-authentication/) at install time. This bypasses the DTR login page and hides the logout button, thereby skipping the need for entering your username and password. From 25218530a6fc75bd39449bf20a3264e6886a0881 Mon Sep 17 00:00:00 2001 From: Psy-Q Date: Thu, 26 Sep 2019 17:37:02 +0200 Subject: [PATCH 3/4] Stop referring to deprecated 'links' feature, replace with 'depends_on' where appropriate (#9480) --- compose/extends.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/compose/extends.md b/compose/extends.md index 0af8391a61..41f8500b08 100644 --- a/compose/extends.md +++ b/compose/extends.md @@ -62,7 +62,7 @@ services. web: image: example/my_web_app:latest - links: + depends_on: - db - cache @@ -136,7 +136,7 @@ Start with a **docker-compose.yml**. web: image: example/my_web_app:latest - links: + depends_on: - db db: @@ -147,7 +147,7 @@ export or backup. dbadmin: build: database_admin/ - links: + depends_on: - db To start a normal environment run `docker-compose up -d`. To run a database @@ -177,9 +177,9 @@ is useful if you have several services that reuse a common set of configuration options. Using `extends` you can define a common set of service options in one place and refer to it from anywhere. -Keep in mind that `links`, `volumes_from`, and `depends_on` are never shared -between services using `extends`. These exceptions exist to avoid implicit -dependencies; you always define `links` and `volumes_from` locally. This ensures +Keep in mind that `volumes_from` and `depends_on` are never shared between +services using `extends`. These exceptions exist to avoid implicit +dependencies; you always define `volumes_from` locally. This ensures dependencies between services are clearly visible when reading the current file. Defining these locally also ensures that changes to the referenced file don't break anything. @@ -233,7 +233,7 @@ You can also write other services and link your `web` service to them: environment: - DEBUG=1 cpu_shares: 5 - links: + depends_on: - db db: image: postgres @@ -264,7 +264,7 @@ common configuration: command: /code/run_web_app ports: - 8080:8080 - links: + depends_on: - queue - db @@ -273,7 +273,7 @@ common configuration: file: common.yml service: app command: /code/run_worker - links: + depends_on: - queue ## Adding and overriding configuration From e1034b60ed67a72cfcca3642cdfc5774a0e753ae Mon Sep 17 00:00:00 2001 From: ada mancini Date: Thu, 26 Sep 2019 11:42:12 -0400 Subject: [PATCH 4/4] update iptables=false documentation (#9482) make it clearer that this is not intended for end-users --- network/iptables.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/network/iptables.md b/network/iptables.md index efedaa5574..d481d8f7db 100644 --- a/network/iptables.md +++ b/network/iptables.md @@ -53,9 +53,9 @@ for a lot more information. ## Prevent Docker from manipulating iptables -To prevent Docker from manipulating the `iptables` policies at all, set the -`iptables` key to `false` in `/etc/docker/daemon.json`. This is inappropriate -for most users, because the `iptables` policies then need to be managed by hand. +It is possible to set the `iptables` key to `false` in the Docker engine's configuration file at `/etc/docker.daemon.json`, but this option is not appropriate for most users. It is not possible to completely prevent Docker from creating `iptables` rules, and creating them after-the-fact is extremely involved and beyond the scope of these instructions. Setting `iptables` to `false` will more than likely break container networking for the Docker engine. + +For system integrators who wish to build the Docker runtime into other applications, explore the [`moby` project](https://mobyproject.org/). ## Next steps