Merge pull request #13578 from docker/master

Publish updates from master

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.
 

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

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

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.

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

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)
 

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 `

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 <image-name>`.
+
 For example, to scan the `getting-started` image you created earlier in the tutorial, you can just type
 
 ```console

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
     ```
 

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.