From 4fcb2c94f40d0b02ce356d33c8669073fb1533bd Mon Sep 17 00:00:00 2001 From: Jason Salas Date: Tue, 14 Sep 2021 05:30:21 +1000 Subject: [PATCH 01/10] Fixed references to old Bulletin Board demo The current documentation references the newer todo list built in the [Getting Started demo](https://docs.docker.com/get-started/02_our_app/) built in previous steps, but the docs listed the code for the older [BulletinBoard:1.0 image](http://www.myclass5.cn/get-started/part2/). So, this patch applies the following to run Getting Started: - changed the name of the image to `getting-started`, and rebuild the image using `docker build -t getting-started .` - changed the port numbers under the `ports` key in the Kubernetes YAML to *3000* --- get-started/kube-deploy.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/get-started/kube-deploy.md b/get-started/kube-deploy.md index ed61088537..fd4a4fb4f7 100644 --- a/get-started/kube-deploy.md +++ b/get-started/kube-deploy.md @@ -44,7 +44,7 @@ All containers in Kubernetes are scheduled as _pods_, which are groups of co-loc spec: containers: - name: bb-site - image: bulletinboard:1.0 + image: getting-started --- apiVersion: v1 kind: Service @@ -56,8 +56,8 @@ All containers in Kubernetes are scheduled as _pods_, which are groups of co-loc selector: bb: web ports: - - port: 8080 - targetPort: 8080 + - port: 3000 + targetPort: 3000 nodePort: 30001 ``` From 5bf13c7380b25c7a42bcbc4782f79af7114c96cd Mon Sep 17 00:00:00 2001 From: rolyli Date: Tue, 14 Sep 2021 01:04:15 +0100 Subject: [PATCH 02/10] Fix code block not being highlightable in the guide --- get-started/07_multi_container.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/get-started/07_multi_container.md b/get-started/07_multi_container.md index 3fc9929c4f..b255026550 100644 --- a/get-started/07_multi_container.md +++ b/get-started/07_multi_container.md @@ -56,7 +56,7 @@ For now, we will create the network first and attach the MySQL container at star If you are using PowerShell then use this command. - ```console + ```powershell PS> docker run -d ` --network todo-app --network-alias mysql ` -v todo-mysql-data:/var/lib/mysql ` @@ -194,7 +194,7 @@ With all of that explained, let's start our dev-ready container! If you are using PowerShell then use this command. - ```console + ```powershell PS> docker run -dp 3000:3000 ` -w /app -v "$(pwd):/app" ` --network todo-app ` From 150b2e59d98c42224ef7dfe8e01828666b864d44 Mon Sep 17 00:00:00 2001 From: "Mountain/\\Ash" Date: Wed, 15 Sep 2021 08:55:54 +0200 Subject: [PATCH 03/10] Random names to match the random name shown in the screenshot --- desktop/dev-environments.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/dev-environments.md b/desktop/dev-environments.md index af06fa357e..7895b42e8f 100644 --- a/desktop/dev-environments.md +++ b/desktop/dev-environments.md @@ -58,7 +58,7 @@ The simplest way to get started with Dev Environments is to create a new environ ![Single container Dev environment](images/dev-env-container.png){:width="700px"} -In the above example, the names `amazing_mclaren` and `stoic_carver` are randomly generated. You'll most likely see different names when you create your Dev Environment. +In the above example, the names `wizardly_ellis` and `relaxed_maclaren` are randomly generated. You'll most likely see different names when you create your Dev Environment. Hover over the container and click **Open in VS Code** to start working in VS Code as usual. You can also open a terminal in VS Code, and use Git to push or pull code to your repository, or switch between branches and work as you would normally. From e41318a10357f5e62f6e416a5e8d6e20ba4aa4c5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 15 Sep 2021 19:27:41 +0200 Subject: [PATCH 04/10] engine: remove Ubuntu 20.10 "Groovy" (EOL: 2021-07-22) Signed-off-by: Sebastiaan van Stijn --- engine/install/ubuntu.md | 1 - 1 file changed, 1 deletion(-) diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md index efd619d282..1d33c5eb90 100644 --- a/engine/install/ubuntu.md +++ b/engine/install/ubuntu.md @@ -28,7 +28,6 @@ To install Docker Engine, you need the 64-bit version of one of these Ubuntu versions: - Ubuntu Hirsute 21.04 -- Ubuntu Groovy 20.10 - Ubuntu Focal 20.04 (LTS) - Ubuntu Bionic 18.04 (LTS) From 884fe37e039763f6faa1cc40d14cc55d8d52b6cb Mon Sep 17 00:00:00 2001 From: Michael Pereira Date: Wed, 15 Sep 2021 14:05:21 -0500 Subject: [PATCH 05/10] Fix link to docker compose release notes Project has changed names but the link here hasn't been updated --- desktop/mac/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/mac/release-notes.md b/desktop/mac/release-notes.md index 42df8f2835..31d938d429 100644 --- a/desktop/mac/release-notes.md +++ b/desktop/mac/release-notes.md @@ -22,7 +22,7 @@ This page contains information about the new features, improvements, known issue ### Upgrades -- [Compose V2 RC3](https://github.com/docker/compose-cli/releases/tag/v2.0.0-rc.3) +- [Compose V2 RC3](https://github.com/docker/compose/releases/tag/v2.0.0-rc.3) - Compose v2 is now hosted on github.com/docker/compose. - Fixed go panic on downscale using `compose up --scale`. - Fixed a race condition in `compose run --rm` while capturing exit code. From 3e5032813f258d9ee2740845a6fa9eb6d73646bb Mon Sep 17 00:00:00 2001 From: Stan Manilov Date: Thu, 16 Sep 2021 22:18:45 +0300 Subject: [PATCH 06/10] Remove outdated sentence The output following the sentence no longer contains what the sentence claims. --- language/python/build-images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/python/build-images.md b/language/python/build-images.md index f2012a2a66..4be4a44330 100644 --- a/language/python/build-images.md +++ b/language/python/build-images.md @@ -145,7 +145,7 @@ python-docker Now that we’ve created our Dockerfile, let’s build our image. To do this, we use the `docker build` command. The `docker build` command builds Docker images from a Dockerfile and a “context”. A build’s context is the set of files located in the specified PATH or URL. The Docker build process can access any of the files located in this context. -The build command optionally takes a `--tag` flag. The tag is used to set the name of the image and an optional tag in the format `name:tag`. We’ll leave off the optional `tag` for now to help simplify things. If you do not pass a tag, Docker uses “latest” as its default tag. You can see this in the last line of the build output. +The build command optionally takes a `--tag` flag. The tag is used to set the name of the image and an optional tag in the format `name:tag`. We’ll leave off the optional `tag` for now to help simplify things. If you do not pass a tag, Docker uses “latest” as its default tag. Let’s build our first Docker image. From c00b213d474d46ea954fc87bcbd1b5129a664c90 Mon Sep 17 00:00:00 2001 From: jerae-duffin <83294991+jerae-duffin@users.noreply.github.com> Date: Fri, 17 Sep 2021 09:40:49 -0500 Subject: [PATCH 07/10] Updated default (#13545) * Updated default * revised sentence * removed hyphen * Update docker-hub/builds/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- docker-hub/builds/index.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/docker-hub/builds/index.md b/docker-hub/builds/index.md index aae0daffee..8aa24fc79e 100644 --- a/docker-hub/builds/index.md +++ b/docker-hub/builds/index.md @@ -302,16 +302,9 @@ You could also use capture groups to build and label images that come from vario ### Build images with BuildKit -You can enable the BuildKit builder by setting the `DOCKER_BUILDKIT=1` -[environment variable](#environment-variables-for-builds) in the -[Configure automated build settings](#configure-automated-build-settings) section. -Refer to the [build images with BuildKit](../../develop/develop-images/build_enhancements.md) +Autobuilds use the BuildKit build system by default. If you want to use the legacy Docker build system, add the [environment variable](index.md#environment-variables-for-builds){: target="_blank" rel="noopener" class="_"} `DOCKER_BUILDKIT=0`. Refer to the [build images with BuildKit](../../develop/develop-images/build_enhancements.md) page for more information on BuildKit. -> **Note** -> -> Autobuilds use the buildKit build-system by default. If you want to use the legacy Docker build-system, add the [environment variable](index.md#environment-variables-for-builds){: target="_blank" rel="noopener" class="_"} DOCKER_BUILDKIT=0. - ## Build repositories with linked private submodules Docker Hub sets up a deploy key in your source code repository that allows it From 55f09cc0d1a84bcb083f661e9cefb3acc07b06b3 Mon Sep 17 00:00:00 2001 From: Nils Caspar Date: Mon, 20 Sep 2021 15:15:56 -0700 Subject: [PATCH 08/10] Fix link to Credential Helper --- desktop/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/index.md b/desktop/index.md index 9c33394672..dd9bcba438 100644 --- a/desktop/index.md +++ b/desktop/index.md @@ -15,7 +15,7 @@ that enables you to build and share containerized applications and microservices Docker Desktop includes [Docker Engine](../engine/index.md), Docker CLI client, [Docker Compose](../compose/index.md), [Docker Content Trust](../engine/security/trust/index.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and -Credential Helper](https://github.com/docker/docker-credential-helpers/). +[Credential Helper](https://github.com/docker/docker-credential-helpers/). Docker Desktop works with your choice of development tools and languages and gives you access to a vast library of certified images and templates in From 24133a237ccc5a152e84ad1b478dd696057c1e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20=C5=A0=C3=B2d=C3=A9k=C3=A9?= Date: Tue, 21 Sep 2021 05:52:01 -0700 Subject: [PATCH 09/10] edit: updated `Security scanning` section (#13546) * edit: updated `Security scanning` section `docker scan` fails when user is not logged in to Docker Hub. First I had to use `docker login` to login to Docker Hub. Afterwards, `docker scan` worked. * Update 09_image_best.md Update format, fix a typo Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- get-started/09_image_best.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/get-started/09_image_best.md b/get-started/09_image_best.md index 22494a3c96..0464f431c9 100644 --- a/get-started/09_image_best.md +++ b/get-started/09_image_best.md @@ -6,9 +6,14 @@ description: Tips for building the images for our application ## Security scanning -When you have built an image, it is good practice to scan it for security vulnerabilities using the `docker scan` command. +When you have built an image, it is a good practice to scan it for security vulnerabilities using the `docker scan` command. Docker has partnered with [Snyk](http://snyk.io){:target="_blank" rel="noopener" class="_"} to provide the vulnerability scanning service. +> **Note** +> +> You must be logged in to Docker Hub to scan your images. Run the command `docker login`, and then scan your images using +> `docker scan `. + For example, to scan the `getting-started` image you created earlier in the tutorial, you can just type ```console From 9b47189fb1e2c493ef4e5f0b533a0fe7f2b5a61a Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Tue, 21 Sep 2021 14:42:20 +0100 Subject: [PATCH 10/10] Remove license modal from Apple silicon docs Signed-off-by: Usha Mandya --- desktop/mac/apple-silicon.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/desktop/mac/apple-silicon.md b/desktop/mac/apple-silicon.md index 974ea6c0a8..b7d8e6473d 100644 --- a/desktop/mac/apple-silicon.md +++ b/desktop/mac/apple-silicon.md @@ -17,9 +17,8 @@ Download Docker Desktop for Mac on Apple silicon: > Download Docker Desktop > -> {%- include eula.md -%} > -> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn .accept-eula } +> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn }