From 30ac03aeb6cf6e4f3433fdf4008429e027b7b890 Mon Sep 17 00:00:00 2001 From: Ben Emamian Date: Mon, 1 Nov 2021 12:53:08 +1100 Subject: [PATCH 1/9] Update insecure.md --- registry/insecure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry/insecure.md b/registry/insecure.md index 2de2d30c8e..461f9ba969 100644 --- a/registry/insecure.md +++ b/registry/insecure.md @@ -72,7 +72,7 @@ This is more secure than the insecure registry solution. -x509 -days 365 -out certs/domain.crt ``` - Be sure to use the name `myregistrydomain.com` as a CN. + Be sure to use the name `myregistry.domain.com` as a CN. 2. Use the result to [start your registry with TLS enabled](./deploying.md#get-a-certificate). From b3b2e4fbfedb35ae1af388e5ab40d5495d86c2ca Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Wed, 3 Nov 2021 14:53:19 +0100 Subject: [PATCH 2/9] Fix typo in HTTP proxy URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s HTTP here, not HTTPS. Besides the rest of the text has `http://proxy.example.com:3128` --- desktop/windows/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/windows/index.md b/desktop/windows/index.md index a4ffe5d4c6..bf66386b8e 100644 --- a/desktop/windows/index.md +++ b/desktop/windows/index.md @@ -155,7 +155,7 @@ 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 -e HTTP_PROXY=https://proxy.example.com:3128 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 From cc5d5db7c58ff8a81a9471a78487a5bed27ca713 Mon Sep 17 00:00:00 2001 From: Dan Bamikiya Date: Fri, 19 Nov 2021 13:18:37 +0100 Subject: [PATCH 3/9] Explain the use of the `COPY` command in the NodeJS example (#13711) * Explain the use of the COPY command in nodejs example * Format updates Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- language/nodejs/build-images.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/language/nodejs/build-images.md b/language/nodejs/build-images.md index 8c0a520aad..893302d451 100644 --- a/language/nodejs/build-images.md +++ b/language/nodejs/build-images.md @@ -130,7 +130,14 @@ WORKDIR /app Usually the very first thing you do once you’ve downloaded a project written in Node.js is to install npm packages. This ensures that your application has all its dependencies installed into the `node_modules` directory where the Node runtime will be able to find them. -Before we can run `npm install`, we need to get our `package.json` and `package-lock.json` files into our images. We use the `COPY` command to do this. The `COPY` command takes two parameters. The first parameter tells Docker what file(s) you would like to copy into the image. The second parameter tells Docker where you want that file(s) to be copied to. We’ll copy the `package.json` and `package-lock.json` file into our working directory `/app`. +Before we can run `npm install`, we need to get our `package.json` and `package-lock.json` files into our images. We use the `COPY` command to do this. The `COPY` command takes two parameters: `src` and `dest`. The first parameter `src` tells Docker what file(s) you would like to copy into the image. The second parameter `dest` tells Docker where you want that file(s) to be copied to. For example: + + ```dockerfile + COPY ["", ""] + ``` + +You can specify multiple `src` resources seperated by a comma. For example, `COPY ["", "",..., ""]`. +We’ll copy the `package.json` and the `package-lock.json` file into our working directory `/app`. ```dockerfile COPY ["package.json", "package-lock.json*", "./"] From f4ab5d173ef9edf6446fa449e1841b45979e7fb5 Mon Sep 17 00:00:00 2001 From: tariqali021 Date: Fri, 19 Nov 2021 17:27:49 +0500 Subject: [PATCH 4/9] Update index.md (#13741) * Update index.md * Style updates Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- get-started/index.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/get-started/index.md b/get-started/index.md index 04ab9e4466..71bd46b50f 100644 --- a/get-started/index.md +++ b/get-started/index.md @@ -134,7 +134,12 @@ Now that you've run a container, what _is_ a container? Simply put, a container a sandboxed process on your machine that is isolated from all other processes on the host machine. That isolation leverages [kernel namespaces and cgroups](https://medium.com/@saschagrunert/demystifying-containers-part-i-kernel-space-2c53d6979504), features that have been in Linux for a long time. Docker has worked to make these -capabilities approachable and easy to use. +capabilities approachable and easy to use. To summarize, a container: + +- is a runnable instance of an image. You can create, start, stop, move, or delete a container using the DockerAPI or CLI. +- can be run on local machines, virtual machines or deployed to the cloud. +- is portable (can be run on any OS) +- Containers are isolated from each other and run their own software, binaries, and configurations. > **Creating containers from scratch** > From 93fe0d15dd53d99407504dde1ecdd0dd81238a7b Mon Sep 17 00:00:00 2001 From: Max Juchheim Date: Fri, 19 Nov 2021 21:49:44 +0900 Subject: [PATCH 5/9] take "+ tab" out of the monospaced codeword (#13730) * take "+ tab" out of the monospaced codeword * Minor style update Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- compose/completion.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/completion.md b/compose/completion.md index dbcc56f454..c7f1a9908b 100644 --- a/compose/completion.md +++ b/compose/completion.md @@ -78,7 +78,7 @@ Make sure you have [installed `oh-my-zsh`](https://ohmyz.sh/) on your computer. Add `docker` and `docker-compose` to the plugins list in `~/.zshrc` to run autocompletion within the oh-my-zsh shell. In the following example, `...` represent other Zsh plugins you may have installed. After that, type `source ~/.zshrc` to bring the changes. -To test whether it is successful, type `docker ps + tab`. +To test whether it is successful, type `docker ps` and then press the **Tab** key. ```shell plugins=(... docker docker-compose) From 0b0b7050e51d391013e87783361f9bdc9ce0099e Mon Sep 17 00:00:00 2001 From: Onkar Lal Janwa Date: Fri, 19 Nov 2021 18:20:30 +0530 Subject: [PATCH 6/9] Update description of -m option (#13813) * Update description of -m option The container memory uses does not go beyond the limit set to `-m`. So I believe the description should be "If you set this option, the maximum allowed value is 6m (6 megabyte)." instead of "If you set this option, the minimum allowed value is 6m (6 megabyte).". * Clarify the threshold for '-m' option Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- config/containers/resource_constraints.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/containers/resource_constraints.md b/config/containers/resource_constraints.md index 9563981abd..9fa84d9108 100644 --- a/config/containers/resource_constraints.md +++ b/config/containers/resource_constraints.md @@ -77,7 +77,7 @@ Most of these options take a positive integer, followed by a suffix of `b`, `k`, | Option | Description | |:-----------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `-m` or `--memory=` | The maximum amount of memory the container can use. If you set this option, the minimum allowed value is `6m` (6 megabyte). | +| `-m` or `--memory=` | The maximum amount of memory the container can use. If you set this option, the minimum allowed value is `6m` (6 megabytes). That is, you must set the value to at least 6 megabytes. | | `--memory-swap`* | The amount of memory this container is allowed to swap to disk. See [`--memory-swap` details](#--memory-swap-details). | | `--memory-swappiness` | By default, the host kernel can swap out a percentage of anonymous pages used by a container. You can set `--memory-swappiness` to a value between 0 and 100, to tune this percentage. See [`--memory-swappiness` details](#--memory-swappiness-details). | | `--memory-reservation` | Allows you to specify a soft limit smaller than `--memory` which is activated when Docker detects contention or low memory on the host machine. If you use `--memory-reservation`, it must be set lower than `--memory` for it to take precedence. Because it is a soft limit, it does not guarantee that the container doesn't exceed the limit. | From 309ebe05e830b3ec594763acc730cfe4bff91629 Mon Sep 17 00:00:00 2001 From: Adisa Malik Date: Fri, 19 Nov 2021 09:37:46 -0500 Subject: [PATCH 7/9] Update inaccurate section headers for backing up/restoring volumes (#13860) * Change section headers for backing up/restoring volumes to use "volume" instead of "container" The section headers "Backup a container" and "Restore container from backup" are used as headers for sections that are actually about backing up and restoring volumes. * Minor style update Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- storage/volumes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/volumes.md b/storage/volumes.md index 61ea2088c8..f1eb56c416 100644 --- a/storage/volumes.md +++ b/storage/volumes.md @@ -519,7 +519,7 @@ Notice the `addr` option is required if using a hostname instead of an IP so doc Volumes are useful for backups, restores, and migrations. Use the `--volumes-from` flag to create a new container that mounts that volume. -### Backup a container +### Back up a volume For example, create a new container named `dbstore`: @@ -540,7 +540,7 @@ $ docker run --rm --volumes-from dbstore -v $(pwd):/backup ubuntu tar cvf /backu When the command completes and the container stops, we are left with a backup of our `dbdata` volume. -### Restore container from backup +### Restore volume from backup With the backup just created, you can restore it to the same container, or another that you made elsewhere. From 74514c833cd0e5ac41096682ac637e84caa6d665 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Fri, 19 Nov 2021 15:30:31 +0000 Subject: [PATCH 8/9] Add Docker Desktop info to the overview Signed-off-by: Usha Mandya --- get-started/overview.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/get-started/overview.md b/get-started/overview.md index 0880c104ee..c332f1cd0c 100644 --- a/get-started/overview.md +++ b/get-started/overview.md @@ -99,6 +99,10 @@ with Docker. When you use commands such as `docker run`, the client sends these commands to `dockerd`, which carries them out. The `docker` command uses the Docker API. The Docker client can communicate with more than one daemon. +### Docker Desktop + +Docker Desktop is an easy-to-install application for your Mac or Windows environment that enables you to build and share containerized applications and microservices. Docker Desktop includes the Docker daemon (`dockerd`), the Docker client (`docker`), Docker Compose, Docker Content Trust, Kubernetes, and Credential Helper. For more information, see [Docker Desktop](../desktop/index.md). + ### Docker registries A Docker _registry_ stores Docker images. Docker Hub is a public From 5ef5b7228f65b52efe939e45267c9f8af78c3917 Mon Sep 17 00:00:00 2001 From: Stephen Turner Date: Fri, 19 Nov 2021 16:59:35 +0000 Subject: [PATCH 9/9] Update wsl.md (#13863) * Update wsl.md Fix broken links to Microsoft docs. * Add target blank attribute To open external links in a new tab * Update Docker Desktop download URL Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- desktop/windows/wsl.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/desktop/windows/wsl.md b/desktop/windows/wsl.md index 75ce01beba..389bffa38b 100644 --- a/desktop/windows/wsl.md +++ b/desktop/windows/wsl.md @@ -25,8 +25,8 @@ Additionally, with WSL 2, the time required to start a Docker daemon after a col Before you install the Docker Desktop WSL 2 backend, you must complete the following steps: 1. Install Windows 10, version 1903 or higher or Windows 11. -2. Enable WSL 2 feature on Windows. For detailed instructions, refer to the [Microsoft documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win10). -3. Download and install the [Linux kernel update package](https://docs.microsoft.com/windows/wsl/wsl2-kernel). +2. Enable WSL 2 feature on Windows. For detailed instructions, refer to the [Microsoft documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win10){:target="_blank" rel="noopener" class="_"}. +3. Download and install the [Linux kernel update package](https://docs.microsoft.com/windows/wsl/wsl2-kernel){:target="_blank" rel="noopener" class="_"}. ## Best practices @@ -39,13 +39,13 @@ Before you install the Docker Desktop WSL 2 backend, you must complete the follo `docker run -v /mnt/c/users:/users` (where `/mnt/c` is mounted from Windows). - Instead, from a Linux shell use a command like `docker run -v ~/my-project:/sources ` where `~` is expanded by the Linux shell to `$HOME`. -- If you have concerns about the size of the docker-desktop-data VHDX, or need to change it, take a look at the [WSL tooling built into Windows](https://docs.microsoft.com/en-us/windows/wsl/wsl2-ux-changes#understanding-wsl-2-uses-a-vhd-and-what-to-do-if-you-reach-its-max-size). -- If you have concerns about CPU or memory usage, you can configure limits on the memory, CPU, Swap size allocated to the [WSL 2 utility VM](https://docs.microsoft.com/en-us/windows/wsl/wsl-config#configure-global-options-with-wslconfig). +- If you have concerns about the size of the docker-desktop-data VHDX, or need to change it, take a look at the [WSL tooling built into Windows](https://docs.microsoft.com/en-us/windows/wsl/vhd-size){:target="_blank" rel="noopener" class="_"}. +- If you have concerns about CPU or memory usage, you can configure limits on the memory, CPU, Swap size allocated to the [WSL 2 utility VM](https://docs.microsoft.com/en-us/windows/wsl/wsl-config#global-configuration-options-with-wslconfig){:target="_blank" rel="noopener" class="_"}. - To avoid any potential conflicts with using WSL 2 on Docker Desktop, you must [uninstall any previous versions of Docker Engine](../../engine/install/ubuntu.md#uninstall-docker-engine) and CLI installed directly through Linux distributions before installing Docker Desktop. ## Download -Download [Docker Desktop Stable 2.3.0.2](https://hub.docker.com/editions/community/docker-ce-desktop-windows/) or a later release. +Download [Docker Desktop 2.3.0.2](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe) or a later release. ## Install @@ -150,4 +150,4 @@ GPU Device 0: "GeForce RTX 2060 with Max-Q Design" with compute capability 7.5 ## Feedback -Your feedback is very important to us. Please let us know your feedback by creating an issue in the [Docker Desktop for Windows GitHub](https://github.com/docker/for-win/issues) repository and adding the **WSL 2** label. +Your feedback is very important to us. Please let us know your feedback by creating an issue in the [Docker Desktop for Windows GitHub](https://github.com/docker/for-win/issues){:target="_blank" rel="noopener" class="_"} repository and adding the **WSL 2** label.