From 0bbe9c32fbfab356e47d97de56fa1f780f70e1ff Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 7 Oct 2020 09:46:08 +0200 Subject: [PATCH 1/2] Fix various broken links Signed-off-by: Sebastiaan van Stijn --- docker-for-mac/edge-release-notes.md | 8 ++++---- docker-for-mac/faqs.md | 13 +++++++++---- docker-for-mac/mutagen.md | 2 +- docker-for-mac/osxfs.md | 2 +- docker-for-mac/release-notes.md | 5 +++-- docker-for-windows/edge-release-notes.md | 2 +- docker-for-windows/release-notes.md | 2 +- docker-hub/billing/faq.md | 4 ++-- engine/security/trust/trust_automation.md | 2 +- engine/tutorials/networkingcontainers.md | 2 +- engine/tutorials/search.png | Bin 17801 -> 0 bytes engine/tutorials/webapp1.png | Bin 9365 -> 0 bytes machine/examples/aws.md | 1 - machine/examples/ocean.md | 1 - machine/get-started-cloud.md | 1 - machine/overview.md | 3 +-- reference/index.md | 13 ++++++------- storage/tmpfs.md | 2 +- test.md | 6 +++--- 19 files changed, 35 insertions(+), 34 deletions(-) delete mode 100644 engine/tutorials/search.png delete mode 100644 engine/tutorials/webapp1.png diff --git a/docker-for-mac/edge-release-notes.md b/docker-for-mac/edge-release-notes.md index e6e2e49f8b..4faf2ddb7e 100644 --- a/docker-for-mac/edge-release-notes.md +++ b/docker-for-mac/edge-release-notes.md @@ -213,7 +213,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ### New -Docker Desktop introduces a directory caching mechanism to greatly improve disk performance in containers. This feature uses [mutagen.io](https://mutagen.io/){: target="_blank" class="_"} to sync files between the host and the containers and benefits from native disk performance. For more information, see [Mutagen-based caching](mutagen-caching.md). +Docker Desktop introduces a directory caching mechanism to greatly improve disk performance in containers. This feature uses [mutagen.io](https://mutagen.io/){: target="_blank" class="_"} to sync files between the host and the containers and benefits from native disk performance. For more information, see [Mutagen-based caching](mutagen.md). We appreciate you trying out an early version of the Mutagen file sync feature. Please let us know your feedback by creating an issue in the [Docker Desktop for Mac GitHub](https://github.com/docker/for-mac/issues){: target="_blank" class="_"} repository with the `Mutagen` label. @@ -950,7 +950,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - Linux kernel 4.9.60 * Bug fixes and minor changes - - Fix login into private repository with certificate issue. [https://github.com/docker/for-mac/issues/2201](docker/for-mac#2201) + - Fix login into private repository with certificate issue. [docker/for-mac#2201](https://github.com/docker/for-mac/issues/2201) * New - For systems running APFS on SSD on High Sierra, use `raw` format virtual machine disks by default. This increases disk throughput (from 320MiB/sec to 600MiB/sec in `dd` on a 2015 MacBook Pro) and disk space handling. @@ -1018,7 +1018,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - AUFS 20170911 * Bug fixes and minor changes - - Kernel: Enable TASK_XACCT and TASK_IO_ACCOUNTING (docker/for-mac#1608) + - Kernel: Enable TASK_XACCT and TASK_IO_ACCOUNTING [docker/for-mac#1608](https://github.com/docker/for-mac/issues/1608) - Rotate logs in the virtual machine more often ### Docker Community Edition 17.09.0-ce-rc1-mac28 2017-09-07 @@ -1812,7 +1812,7 @@ events or unexpected unmounts. **Hotfixes** -* osxfs: fixed an issue causing access to children of renamed directories to fail (symptoms: npm failures, apt-get failures) (docker/for-mac) +* osxfs: fixed an issue causing access to children of renamed directories to fail (symptoms: npm failures, apt-get failures) * osxfs: fixed an issue causing some ATTRIB and CREATE `inotify` events to fail delivery and other `inotify` events to stop diff --git a/docker-for-mac/faqs.md b/docker-for-mac/faqs.md index 0186b3704f..d15846c14d 100644 --- a/docker-for-mac/faqs.md +++ b/docker-for-mac/faqs.md @@ -33,7 +33,7 @@ Yes, you can switch between Stable and Edge versions. You can try out the Edge r ## What are the system requirements for Docker Desktop? -You need a Mac that supports hardware virtualization. For more information, see [Docker Desktop Mac system requirements](install/#system-requirements). +You need a Mac that supports hardware virtualization. For more information, see [Docker Desktop Mac system requirements](install.md#system-requirements). ## What is an experimental feature? @@ -74,7 +74,7 @@ For more information and examples, see We recommend that you publish a port, or connect from another container. You can use the same method on Linux if the container is on an overlay network and not a bridge network, as these are not routed. For more information and examples, see -[I want to connect to a container from the Mac](networking.md#i-want-to-connect-to-a-container-from-the-mac) in the [Networking](/docker-for-mac/networking/) topic. +[I want to connect to a container from the Mac](networking.md#i-want-to-connect-to-a-container-from-the-mac) in the [Networking](networking.md) topic. ### Can I use an SSH agent inside a container? @@ -97,7 +97,12 @@ serial port) to a container as it requires support at the hypervisor level. ### Can I run Docker Desktop in nested virtualization scenarios? -Docker Desktop can run inside a Windows 10 VM running on apps like Parallels or VMware Fusion on a Mac provided that the VM is properly configured. However, problems and intermittent failures may still occur due to the way these apps virtualize the hardware. For these reasons, **Docker Desktop is not supported in nested virtualization scenarios**. It might work in some cases, and not in others. For more information, see [Running Docker Desktop in nested virtualization scenarios](/docker-for-windows/troubleshoot/#running-docker-desktop-in-nested-virtualization-scenarios). +Docker Desktop can run inside a Windows 10 VM running on apps like Parallels or +VMware Fusion on a Mac provided that the VM is properly configured. However, +problems and intermittent failures may still occur due to the way these apps +virtualize the hardware. For these reasons, **Docker Desktop is not supported in +nested virtualization scenarios**. It might work in some cases, and not in others. +For more information, see [Running Docker Desktop in nested virtualization scenarios](../docker-for-windows/troubleshoot.md#running-docker-desktop-in-nested-virtualization-scenarios). ## Components of Docker Desktop @@ -144,7 +149,7 @@ response. ### How can I opt out of sending my usage data? If you do not want to send of usage data, use the Stable channel. For more -information, see [What is the difference between the Stable and Edge versions of Docker Desktop](#stable-and-edge-channels). +information, see [What is the difference between the Stable and Edge versions of Docker Desktop](#stable-and-edge-releases). ### How is personal data handled in Docker Desktop? diff --git a/docker-for-mac/mutagen.md b/docker-for-mac/mutagen.md index 69a6bd9e20..1f2e87cffc 100644 --- a/docker-for-mac/mutagen.md +++ b/docker-for-mac/mutagen.md @@ -3,7 +3,7 @@ description: High-performance two-way file sync for volume mounts keywords: mac, mutagen, volumes, file sync, title: Mutagen-based file synchronization redirect_from: -- /docker-for-mac//mutagen-caching/ +- /docker-for-mac/mutagen-caching/ --- Docker Desktop for Mac on Edge has a new file sharing feature which performs diff --git a/docker-for-mac/osxfs.md b/docker-for-mac/osxfs.md index bc313b36d9..1778f267f4 100644 --- a/docker-for-mac/osxfs.md +++ b/docker-for-mac/osxfs.md @@ -244,7 +244,7 @@ At present there is support for read caching, with which the container's view of the file system can temporarily drift apart from the authoritative view on the host. Further caching developments, including support for write caching, are planned. -A [detailed description of the behavior in various caching configurations](osxfs-caching) +A [detailed description of the behavior in various caching configurations](osxfs-caching.md) is available. #### What we are doing diff --git a/docker-for-mac/release-notes.md b/docker-for-mac/release-notes.md index fe80d0c4b5..1e71da721b 100644 --- a/docker-for-mac/release-notes.md +++ b/docker-for-mac/release-notes.md @@ -189,7 +189,7 @@ Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus ### New - **Docker Desktop Dashboard:** The new Docker Desktop **Dashboard** provides a user-friendly interface which enables you to interact with containers and applications, and manage the lifecycle of your applications directly from the UI. In addition, it allows you to access the logs, view container details, and monitor resource utilization to explore the container behavior. -For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](dashboard.md). +For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../desktop/dashboard.md). - Introduced a new user interface for the Docker Desktop **Preferences** menu. - The Restart, Reset, and Uninstall options are now available on the **Troubleshoot** menu. @@ -248,7 +248,8 @@ Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kuber ### New -Docker Desktop now enables you to sign into Docker Hub using two-factor authentication. For more information, see [Two-factor authentication](index/#docker-hub). +Docker Desktop now enables you to sign into Docker Hub using two-factor authentication. +For more information, see [Two-factor authentication](index.md#docker-hub). ## Docker Desktop Community 2.1.0.3 2019-09-16 diff --git a/docker-for-windows/edge-release-notes.md b/docker-for-windows/edge-release-notes.md index cd4d2c464f..ca362124c3 100644 --- a/docker-for-windows/edge-release-notes.md +++ b/docker-for-windows/edge-release-notes.md @@ -213,7 +213,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for - Fixed application startup if `hosts` is specified inside the Docker `daemon.json`. See [docker/for-win#6895](https://github.com/docker/for-win/issues/6895#issuecomment-637429117). - Fixed opening a CLI from the dashboard for Windows containers. See [docker/for-win#7079](https://github.com/docker/for-win/issues/7079). -- Fixed an issue where adding a folder on a non-existing drive in the settings would create an empty entry. See [docker/for-win#6797](docker/for-win#6797). +- Fixed an issue where adding a folder on a non-existing drive in the settings would create an empty entry. See [docker/for-win#6797](https://github.com/docker/for-win/issues/6797). - Fixed an issue when updating Windows to a WSL 2 capable version, where a configuration file is locked by the old Hyper-V VM. - Pinning the application to the taskbar and clicking on it will launch the container view if Docker is already running. - Left-clicking on the Docker icon in the system tray now launches the container view Dashboard. See [docker/for-win#6650](https://github.com/docker/for-win/issues/6650). diff --git a/docker-for-windows/release-notes.md b/docker-for-windows/release-notes.md index 9ed4ccd205..7c8c880aef 100644 --- a/docker-for-windows/release-notes.md +++ b/docker-for-windows/release-notes.md @@ -312,7 +312,7 @@ Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus ### New - **Docker Desktop Dashboard:** The new Docker Desktop **Dashboard** provides a user-friendly interface which enables you to interact with containers and applications, and manage the lifecycle of your applications directly from the UI. In addition, it allows you to access the logs, view container details, and monitor resource utilization to explore the container behavior. -For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](dashboard.md). +For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../desktop/dashboard.md). - **WSL 2 backend:** The experimental Docker Desktop WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](https://docs.docker.com/docker-for-windows/wsl/). diff --git a/docker-hub/billing/faq.md b/docker-hub/billing/faq.md index e4eb6ee820..6d48c54373 100644 --- a/docker-hub/billing/faq.md +++ b/docker-hub/billing/faq.md @@ -50,13 +50,13 @@ You can create a new account at [Docker Hub pricing](https://hub.docker.com/pric Upgrading your legacy plan to a Pro plan offers you unlimited public repositories, unlimited private repositories, and unlimited collaborators. Once you’ve upgraded your current legacy individual plan to a Pro plan, it is not possible to switch back to the legacy per-repository plan. -For information on how to upgrade to a Pro plan from a legacy (per-repository plan) plan, see [Upgrade to a Pro plan](/upgrade.md#upgrade-to-a-pro-plan). +For information on how to upgrade to a Pro plan from a legacy (per-repository plan) plan, see [Upgrade to a Pro plan](upgrade.md#upgrade-to-a-pro-plan). ### How do I upgrade to a Team plan from a legacy organization plan? Upgrading your legacy plan to a Team plan offers you unlimited public and private repositories, unlimited teams, and 3 parallel builds. Once you’ve upgraded your current legacy organization plan to a Team plan, it is not possible to switch back to the legacy per-repository plan. -For information on how to upgrade to a Team plan from a legacy (per-repository) plan, see [Upgrade to a Team plan](/upgrade.md#upgrade-to-a-team-plan). +For information on how to upgrade to a Team plan from a legacy (per-repository) plan, see [Upgrade to a Team plan](upgrade.md#upgrade-to-a-team-plan). ### How do downgrades from a Pro or Team plan work? diff --git a/engine/security/trust/trust_automation.md b/engine/security/trust/trust_automation.md index 439d4c54a4..bf2046105e 100644 --- a/engine/security/trust/trust_automation.md +++ b/engine/security/trust/trust_automation.md @@ -9,7 +9,7 @@ systems. To allow tools to wrap Docker and push trusted content, there are environment variables that can be passed through to the client. This guide follows the steps as described -[here](content_trust/#signing-images-with-docker-content-trust) so please read +[here](content_trust.md#signing-images-with-docker-content-trust) so please read that and understand its prerequisites. When working directly with the Notary client, it uses its [own set of environment variables](../../../notary/reference/client-config.md#environment-variables-optional). diff --git a/engine/tutorials/networkingcontainers.md b/engine/tutorials/networkingcontainers.md index 5221aa3647..85cfd3d7b9 100644 --- a/engine/tutorials/networkingcontainers.md +++ b/engine/tutorials/networkingcontainers.md @@ -33,7 +33,7 @@ The network named `bridge` is a special network. Unless you tell it otherwise, D 74695c9cea6d9810718fddadc01a727a5dd3ce6a69d09752239736c030599741 -

bridge1

+![bridge1](bridge1.png) Inspecting the network is an easy way to find out the container's IP address. diff --git a/engine/tutorials/search.png b/engine/tutorials/search.png deleted file mode 100644 index 6940e19827c6bf8b8810c7f058be54392f2830a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17801 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%0D~J*l8k5O0W&An3@)F&~R~zoQ>`mk(+5 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 tuple. The `--mount` syntax is more verbose than `--tmpfs`: - - The `type` of the mount, which can be [`bind`](bind-mounts-md), `volume`, or + - The `type` of the mount, which can be [`bind`](bind-mounts.md), `volume`, or [`tmpfs`](tmpfs.md). This topic discusses `tmpfs`, so the type is always `tmpfs`. - The `destination` takes as its value the path where the `tmpfs` mount diff --git a/test.md b/test.md index fbee763846..a6c54202e5 100644 --- a/test.md +++ b/test.md @@ -239,7 +239,7 @@ only need to do it on the first one. If you have a ``, set it there. This is some test text.

This is more text on a new line.

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. - This is some more text about the right hand side. There is a link here to the Docker Experimental Features README on GitHub. In tables, links need to be ``.

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + This is some more text about the right hand side. There is a link here to the Docker Experimental Features README on GitHub. In tables, links need to be ``.

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. @@ -422,8 +422,8 @@ then it takes up the whole row. You can use the Bootstrap and CSS to add expand/collapse accordions. This implementation makes use of the `.panel-heading` classes in -[`_utilities.scss`](/_scss/_utilities.scss), along with [FontAwesome -icons](http://fontawesome.io/cheatsheet/){: target="_blank" class="_" } +[`_utilities.scss`](https://github.com/docker/docker.github.io/blob/master/_scss/_utilities.scsss), +along with [FontAwesome icons](http://fontawesome.io/cheatsheet/){: target="_blank" class="_" } (fa-caret-down) and (fa-caret-up). From 2eff941697fcd1642fbe264a1bd0d9cce93247b0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 7 Oct 2020 10:24:31 +0200 Subject: [PATCH 2/2] compose: move deprecated env-vars section, and fix duplicate redirects Signed-off-by: Sebastiaan van Stijn --- compose/compose-file/compose-file-v1.md | 42 +++++++++++++++++++- compose/compose-file/compose-file-v2.md | 2 - compose/compose-file/compose-versioning.md | 6 +-- compose/environment-variables.md | 11 +++--- compose/link-env-deprecated.md | 45 ---------------------- 5 files changed, 48 insertions(+), 58 deletions(-) delete mode 100644 compose/link-env-deprecated.md diff --git a/compose/compose-file/compose-file-v1.md b/compose/compose-file/compose-file-v1.md index 9910f6190e..c68244856f 100644 --- a/compose/compose-file/compose-file-v1.md +++ b/compose/compose-file/compose-file-v1.md @@ -1,8 +1,6 @@ --- description: Compose file reference keywords: fig, composition, compose version 1, docker -redirect_from: -- /compose/yml title: Compose file version 1 reference toc_max: 4 toc_min: 1 @@ -442,6 +440,46 @@ Links also express dependency between services in the same way as > links between them must share at least one network in common in order to > communicate. +#### link environment variables + +> [Version 1 file format](compose-versioning.md#version-1) only. In version 2 and +> up, custom networks are used, and no environment variables are created. + +> **Note** +> +> Environment variables are no longer the recommended method for connecting to +> linked services. Instead, you should use the link name (by default, the name +> of the linked service) as the hostname to connect to. Refer to the +> [docker-compose.yml documentation](compose-file/index.md#links) for details. +> +> Environment variables are only populated if you use the +> [legacy version 1 Compose file format](compose-file/compose-versioning.md#versioning). +{: .warning } + +Compose uses [Docker links](../../network/links.md) +to expose services' containers to one another. Each linked container injects a set of +environment variables, each of which begins with the uppercase name of the container. + +To see what environment variables are available to a service, run `docker-compose run SERVICE env`. + +name\_PORT
+Full URL, such as `DB_PORT=tcp://172.17.0.5:5432` + +name\_PORT\_num\_protocol
+Full URL, such as `DB_PORT_5432_TCP=tcp://172.17.0.5:5432` + +name\_PORT\_num\_protocol\_ADDR
+Container's IP address, such as `DB_PORT_5432_TCP_ADDR=172.17.0.5` + +name\_PORT\_num\_protocol\_PORT
+Exposed port number, such as `DB_PORT_5432_TCP_PORT=5432` + +name\_PORT\_num\_protocol\_PROTO
+Protocol (tcp or udp), such as `DB_PORT_5432_TCP_PROTO=tcp` + +name\_NAME
+Fully qualified container name, such as `DB_1_NAME=/myapp_web_1/myapp_db_1` + ### log_driver > [Version 1 file format](compose-versioning.md#version-1) only. In version 2 and up, use diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md index ad39219bee..8963e89f32 100644 --- a/compose/compose-file/compose-file-v2.md +++ b/compose/compose-file/compose-file-v2.md @@ -1,8 +1,6 @@ --- description: Compose file reference keywords: fig, composition, compose version 3, docker -redirect_from: -- /compose/yml title: Compose file version 2 reference toc_max: 4 toc_min: 1 diff --git a/compose/compose-file/compose-versioning.md b/compose/compose-file/compose-versioning.md index 575ad681b9..d7f7eba3bf 100644 --- a/compose/compose-file/compose-versioning.md +++ b/compose/compose-file/compose-versioning.md @@ -453,10 +453,8 @@ It's more complicated if you're using particular configuration features: options: syslog-address: "tcp://192.168.0.42:123" -- `links` with environment variables: As documented in the - [environment variables reference](../link-env-deprecated.md), environment variables - created by - links have been deprecated for some time. In the new Docker network system, +- `links` with environment variables: environment variables created by + links, such as `CONTAINERNAME_PORT`, ` have been deprecated for some time. In the new Docker network system, they have been removed. You should either connect directly to the appropriate hostname or set the relevant environment variable yourself, using the link hostname: diff --git a/compose/environment-variables.md b/compose/environment-variables.md index 8403a42af9..7166d288be 100644 --- a/compose/environment-variables.md +++ b/compose/environment-variables.md @@ -2,6 +2,9 @@ title: Environment variables in Compose description: How to set, use and manage environment variables in Compose keywords: compose, orchestration, environment, env file +redirect_from: +- /compose/env +- /compose/link-env-deprecated --- There are multiple parts of Compose that deal with environment variables in one @@ -192,8 +195,6 @@ documented in [CLI Environment Variables](reference/envvars.md). ## Environment variables created by links When using the ['links' option](compose-file/index.md#links) in a -[v1 Compose file](compose-file/index.md#version-1), environment variables are created -for each link. They are documented in -the [Link environment variables reference](link-env-deprecated.md). - -However, these variables are deprecated. Use the link alias as a hostname instead. +[v1 Compose file](compose-file/compose-file-v1.md#link-environment-variables), +environment variables are created for each link. These variables are deprecated. +Use the link alias as a hostname instead. diff --git a/compose/link-env-deprecated.md b/compose/link-env-deprecated.md deleted file mode 100644 index d4b5095e37..0000000000 --- a/compose/link-env-deprecated.md +++ /dev/null @@ -1,45 +0,0 @@ ---- -description: Compose CLI reference -keywords: fig, composition, compose, docker, orchestration, cli, reference -redirect_from: -- /compose/env -title: Link environment variables (superseded) -notoc: true ---- - -> **Note**: Environment variables are no longer the recommended method for connecting to linked services. Instead, you should use the link name (by default, the name of the linked service) as the hostname to connect to. See the [docker-compose.yml documentation](compose-file/#links) for details. -> -> Environment variables are only populated if you're using the [legacy version 1 Compose file format](compose-file/compose-versioning.md#versioning). - -Compose uses [Docker links](../network/links.md) -to expose services' containers to one another. Each linked container injects a set of -environment variables, each of which begins with the uppercase name of the container. - -To see what environment variables are available to a service, run `docker-compose run SERVICE env`. - -name\_PORT
-Full URL, such as `DB_PORT=tcp://172.17.0.5:5432` - -name\_PORT\_num\_protocol
-Full URL, such as `DB_PORT_5432_TCP=tcp://172.17.0.5:5432` - -name\_PORT\_num\_protocol\_ADDR
-Container's IP address, such as `DB_PORT_5432_TCP_ADDR=172.17.0.5` - -name\_PORT\_num\_protocol\_PORT
-Exposed port number, such as `DB_PORT_5432_TCP_PORT=5432` - -name\_PORT\_num\_protocol\_PROTO
-Protocol (tcp or udp), such as `DB_PORT_5432_TCP_PROTO=tcp` - -name\_NAME
-Fully qualified container name, such as `DB_1_NAME=/myapp_web_1/myapp_db_1` - -## Related information - -- [User guide](index.md) -- [Installing Compose](install.md) -- [Getting Started](gettingstarted.md) -- [Command line reference](reference/index.md) -- [Compose file reference](compose-file/index.md) -- [Sample apps with Compose](samples-for-compose.md)