Publish the latest updates from master

_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"

_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"

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 <app-name>` command.
 ```

compose/django.md

@@ -46,7 +46,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>=2.0,<3.0
-       psycopg2>=2.7,<3.0
+       psycopg2-binary>=2.8
 
 7. Save and close the `requirements.txt` file.
 

compose/reference/push.md

@@ -31,5 +31,5 @@ services:
 
   service2:
     build: .
-    image: youruser/yourimage  # goes to youruser DockerHub registry
+    image: your-dockerid/yourimage  # goes to your repository on Docker Hub
 ```

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)
 

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
 {

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
 

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
 

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)
 	}

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.

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