From 9031360ae77681cd8e12e0eae25f2ffdb8ed66af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20O=C4=9Fuzhan=20Y=C4=B1ld=C4=B1z?= Date: Tue, 11 Sep 2018 13:23:10 +0300 Subject: [PATCH 01/12] rename psycopg2 to psycopg2-binary --- compose/django.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/django.md b/compose/django.md index 8c1ffaa34d87..64ebef56715d 100644 --- a/compose/django.md +++ b/compose/django.md @@ -47,7 +47,7 @@ and a `docker-compose.yml` file. (You can use either a `.yml` or `.yaml` extensi 6. Add the required software in the file. Django>=1.8,<2.0 - psycopg2 + psycopg2-binary 7. Save and close the `requirements.txt` file. From 6f38ea561b0c9bc55813328ad478259e33b8eca4 Mon Sep 17 00:00:00 2001 From: Andre Almar Date: Mon, 29 Jun 2020 16:01:24 -0300 Subject: [PATCH 02/12] Fixing ImageList Go code Original: on line 18 we have `images, err := cli.ImageList(context.Background(), types.ImageListOptions{})` which gives us an error of: ``` # command-line-arguments ./main.go:12:2: ctx declared but not used ``` *Fix:* on line 18 we need to have `images, err := cli.ImageList(ctx, types.ImageListOptions{})` --- engine/api/sdk/examples.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/api/sdk/examples.md b/engine/api/sdk/examples.md index e21177854f9e..e8e66ba55a0f 100644 --- a/engine/api/sdk/examples.md +++ b/engine/api/sdk/examples.md @@ -471,7 +471,7 @@ func main() { panic(err) } - images, err := cli.ImageList(context.Background(), types.ImageListOptions{}) + images, err := cli.ImageList(ctx, types.ImageListOptions{}) if err != nil { panic(err) } From ea11c504106a2bc9ae79ccd4a787182f1b729464 Mon Sep 17 00:00:00 2001 From: Alan Bondarchuk Date: Tue, 30 Jun 2020 12:32:22 +0300 Subject: [PATCH 03/12] Add missing space (#11061) --- compose/reference/push.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/reference/push.md b/compose/reference/push.md index 262899cf2d53..6dc500bddf21 100644 --- a/compose/reference/push.md +++ b/compose/reference/push.md @@ -31,5 +31,5 @@ services: service2: build: . - image: youruser/yourimage # goes to youruser DockerHub registry + image: youruser/yourimage # goes to your user DockerHub registry ``` From 9fd5223c7efb5cb6de2d1c5bb21b53140268e03d Mon Sep 17 00:00:00 2001 From: Sobhan Attar Date: Wed, 1 Jul 2020 11:30:11 +0430 Subject: [PATCH 04/12] add not for non existence daemon.json --- config/containers/logging/configure.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/containers/logging/configure.md b/config/containers/logging/configure.md index 4154de5de845..848dee1152a8 100644 --- a/config/containers/logging/configure.md +++ b/config/containers/logging/configure.md @@ -24,9 +24,9 @@ implement and use [logging driver plugins](plugins.md). To configure the Docker daemon to default to a specific logging driver, set the value of `log-driver` to the name of the logging driver in the `daemon.json` file, which is located in `/etc/docker/` on Linux hosts or -`C:\ProgramData\docker\config\` on Windows server hosts. The default logging -driver is `json-file`. The following example explicitly sets the default -logging driver to `syslog`: +`C:\ProgramData\docker\config\` on Windows server hosts. Note that you should create `daemon.json` +file, if the file does not exist. +The default logging driver is `json-file`. The following example explicitly sets the default logging driver to `syslog`: ```json { From 8d1b473aa721f2b53777faabf46e37ab8863661b Mon Sep 17 00:00:00 2001 From: Sujay Pillai Date: Wed, 1 Jul 2020 08:30:40 +0000 Subject: [PATCH 05/12] Add a note to create a context in different subscription (#11065) * Add a note to create a context in different subscription * Minor style updates Made a minor tweak to the style and wrapped the new note to 80 chars Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- engine/context/aci-integration.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/engine/context/aci-integration.md b/engine/context/aci-integration.md index e43946818615..f30c8131dd2e 100644 --- a/engine/context/aci-integration.md +++ b/engine/context/aci-integration.md @@ -71,6 +71,11 @@ myacicontext aci myResourceGroupGTA@eastus default * moby Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm ``` +> **Note** +> +> If you need to change the subscription and create a new context, you must +execute the `docker login azure` command again. + ### Run a container Now that you've logged in and created an ACI context, you can start using Docker commands to deploy containers on ACI. From e43aa440e3f8a945221c90f60867342a8ac699b6 Mon Sep 17 00:00:00 2001 From: Lester Covax <34850610+LesterCovax@users.noreply.github.com> Date: Wed, 1 Jul 2020 06:31:46 -0400 Subject: [PATCH 06/12] Fixed typo (#11045) s/form/from --- app/working-with-app.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/working-with-app.md b/app/working-with-app.md index 7e7a3b2d169e..55202afa23aa 100644 --- a/app/working-with-app.md +++ b/app/working-with-app.md @@ -267,7 +267,7 @@ my-app 1 Swarm Now that the app is running, you can point a web browser at the DNS name or public IP of the Docker node on port 8080 and see the app. You must ensure traffic to port 8080 is allowed on -the connection form your browser to your Docker host. +the connection from your browser to your Docker host. Now change the port of the application using `docker app upgrade ` command. ``` From dbd9ba12f988f81882f20ed28a8e685d71dd8ae7 Mon Sep 17 00:00:00 2001 From: Martin Joly Date: Wed, 1 Jul 2020 15:09:51 +0200 Subject: [PATCH 07/12] Fix wrong information (#10977) Postgres last version is now >12.0.0. --- engine/examples/postgresql_service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/examples/postgresql_service.md b/engine/examples/postgresql_service.md index 5b1898d75753..b7b9ae2ae1f1 100644 --- a/engine/examples/postgresql_service.md +++ b/engine/examples/postgresql_service.md @@ -28,7 +28,7 @@ FROM ubuntu:16.04 RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 # Add PostgreSQL's repository. It contains the most recent stable release -# of PostgreSQL, ``9.3``. +# of PostgreSQL. RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list # Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3 From dba80f363198da36e61bef6e12c9105710b6eac7 Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Wed, 1 Jul 2020 15:42:14 +0200 Subject: [PATCH 08/12] Correct proxies documentation for Docker Desktop (mac) (#11069) * Update index.md The proxies set in the Docker Desktop settings are actually not propagated in the containers automatically. The rationale being that we want the same UX on Windows/Mac and as on Linux. Related to https://github.com/docker/docker.github.io/pull/10890 * Minor update Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- docker-for-mac/index.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md index cae527af8504..900d11abbd5b 100644 --- a/docker-for-mac/index.md +++ b/docker-for-mac/index.md @@ -175,28 +175,26 @@ For more information, see: #### Proxies Docker Desktop detects HTTP/HTTPS Proxy Settings from macOS and automatically -propagates these to Docker and to your containers. For example, if you set your +propagates these to Docker. For example, if you set your proxy settings to `http://proxy.example.com`, Docker uses this proxy when pulling containers. -When you start a container, your proxy settings propagate into the containers. -For example: +Your proxy settings, however, will not be propagated into the containers you start. +If you wish to set the proxy settings for your containers, you need to define +environment variables for them, just like you would do on Linux, for example: ``` -$ docker run -it alpine env +$ docker run -e HTTP_PROXY=http://proxy.example.com:3128 alpine env + PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin HOSTNAME=b7edf988b2b5 TERM=xterm HOME=/root HTTP_PROXY=http://proxy.example.com:3128 -http_proxy=http://proxy.example.com:3128 -no_proxy=*.local, 169.254/16 ``` -You can see from the above output that the `HTTP_PROXY`, `http_proxy`, and -`no_proxy` environment variables are set. When your proxy configuration changes, -Docker restarts automatically to pick up the new settings. If you have any -containers that you would like to keep running across restarts, you should consider using [restart policies](/engine/reference/run/#restart-policies-restart). +For more information on setting environment variables for running containers, +see [Set environment variables](/engine/reference/commandline/run/#set-environment-variables--e---env---env-file). #### Network From 39a054a0161bad312bc415d434933d7ab6173086 Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Wed, 1 Jul 2020 16:10:19 +0200 Subject: [PATCH 09/12] Correct proxies documentation for Docker Desktop (windows) (#10890) * Correct proxies documentation for Docker Desktop The proxies set in the Docker Desktop settings are actually not propagated in the containers automatically. The rationale being that we want the same UX on Windows/Mac and as on Linux. Closes https://github.com/docker/for-win/issues/3676 * Minor style updates * Wrap to 80 chars Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- docker-for-windows/index.md | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md index 34fbbbc35ddc..d52e09f2ecb9 100644 --- a/docker-for-windows/index.md +++ b/docker-for-windows/index.md @@ -280,29 +280,25 @@ containers. Alternatively, you can opt not to share it by selecting **Cancel**. #### Proxies Docker Desktop lets you configure HTTP/HTTPS Proxy Settings and -automatically propagates these to Docker and to your containers. For example, -if you set your proxy settings to `http://proxy.example.com`, Docker uses this -proxy when pulling containers. +automatically propagates these to Docker. For example, if you set your proxy +settings to `http://proxy.example.com`, Docker uses this proxy when pulling containers. -When you start a container, your proxy settings propagate into the containers. For example: +Your proxy settings, however, will not be propagated into the containers you start. +If you wish to set the proxy settings for your containers, you need to define +environment variables for them, just like you would do on Linux, for example: ```ps -> docker run alpine env +> docker run -e HTTP_PROXY=http://proxy.example.com:3128 alpine env PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin HOSTNAME=b7edf988b2b5 TERM=xterm HOME=/root HTTP_PROXY=http://proxy.example.com:3128 -http_proxy=http://proxy.example.com:3128 -no_proxy=*.local, 169.254/16 ``` -In the output above, the `HTTP_PROXY`, `http_proxy`, and `no_proxy` environment -variables are set. When your proxy configuration changes, Docker restarts -automatically to pick up the new settings. If you have containers that you wish -to keep running across restarts, you should consider using -[restart policies](/engine/reference/run/#restart-policies-restart). +For more information on setting environment variables for running containers, +see [Set environment variables](/engine/reference/commandline/run/#set-environment-variables--e---env---env-file). #### Network From 7b70c20f1f2f02b3917100ab96cb9e0d0a258c7f Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Wed, 1 Jul 2020 16:21:33 +0200 Subject: [PATCH 10/12] Bump docker-compose 1.26.1 (#11068) * Bump docker-compose 1.26.1 Signed-off-by: Ulysses Souza * Minor style updates Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- _config.yml | 2 +- _config_authoring.yml | 2 +- compose/release-notes.md | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 577366f98978..3e60f7333a08 100644 --- a/_config.yml +++ b/_config.yml @@ -23,7 +23,7 @@ google_analytics: GTM-WL2QLG5 latest_engine_api_version: "1.40" docker_ce_version: "19.03" -compose_version: "1.26.0" +compose_version: "1.26.1" compose_file_v3: "3.8" compose_file_v2: "2.4" machine_version: "0.16.0" diff --git a/_config_authoring.yml b/_config_authoring.yml index e6f6f967ff29..854caa360f27 100644 --- a/_config_authoring.yml +++ b/_config_authoring.yml @@ -21,7 +21,7 @@ exclude: ["_scripts", "tests", "apidocs/layouts", "Gemfile", "hooks", "index.htm latest_engine_api_version: "1.40" docker_ce_version: "19.03" -compose_version: "1.26.0" +compose_version: "1.26.1" compose_file_v3: "3.8" compose_file_v2: "2.4" machine_version: "0.16.0" diff --git a/compose/release-notes.md b/compose/release-notes.md index ba0133025bea..ea4fbcbf1d8a 100644 --- a/compose/release-notes.md +++ b/compose/release-notes.md @@ -7,6 +7,19 @@ redirect_from: - /release-notes/docker-compose/ --- +## 1.26.1 +(2020-06-30) + +### Features + +- Bumped `docker-py` from 4.2.1 to 4.2.2. + +### Bug fixes + +- Enforced `docker-py` 4.2.1 as minimum version when installing with pip. + +- Fixed context load for non-docker endpoints. + ## 1.26.0 (2020-06-03) From ff1578ba9d66d1da608ac66d8ed14f1b5ae861de Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Wed, 1 Jul 2020 16:30:02 +0100 Subject: [PATCH 11/12] Update image push reference --- compose/reference/push.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/reference/push.md b/compose/reference/push.md index 6dc500bddf21..9de9f61db3d8 100644 --- a/compose/reference/push.md +++ b/compose/reference/push.md @@ -31,5 +31,5 @@ services: service2: build: . - image: youruser/yourimage # goes to your user DockerHub registry + image: yourDockerID/yourimage # goes to your repository on Docker Hub ``` From 9031d8729513633e250984015d4d76b594833087 Mon Sep 17 00:00:00 2001 From: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Date: Wed, 1 Jul 2020 16:58:28 +0100 Subject: [PATCH 12/12] Update to use lowercase --- compose/reference/push.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/reference/push.md b/compose/reference/push.md index 9de9f61db3d8..4ee693aed373 100644 --- a/compose/reference/push.md +++ b/compose/reference/push.md @@ -31,5 +31,5 @@ services: service2: build: . - image: yourDockerID/yourimage # goes to your repository on Docker Hub + image: your-dockerid/yourimage # goes to your repository on Docker Hub ```