diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 6aaf1e9e3031..c4cb27d9fe51 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -24,7 +24,7 @@ jobs: git fetch origin main:main git reset --hard main - name: Create Pull Request - uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f + uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f with: delete-branch: false branch: published-update diff --git a/README.md b/README.md index 9b24b96218f2..39500fb38823 100644 --- a/README.md +++ b/README.md @@ -49,4 +49,4 @@ contribute, see [CONTRIBUTING.md](CONTRIBUTING.md). ## Copyright and license -Copyright 2013-2024 Docker, Inc., released under the Apache 2.0 license . +Copyright 2013-2025 Docker, Inc., released under the Apache 2.0 license . diff --git a/content/get-started/introduction/build-and-push-first-image.md b/content/get-started/introduction/build-and-push-first-image.md index 69af604c8050..0e9774036d0c 100644 --- a/content/get-started/introduction/build-and-push-first-image.md +++ b/content/get-started/introduction/build-and-push-first-image.md @@ -144,32 +144,36 @@ Now that you have a repository, you are ready to build and push your image. An i {{< /tab >}} {{< tab name="VS Code" >}} -1. Open Visual Studio Code. In the **File** menu, select **Open Folder**. Choose **Clone Git Repository** and paste this URL: [https://github.com/docker/getting-started-todo-app](https://github.com/docker/getting-started-todo-app) +1. Open Visual Studio Code. Ensure you have the **Docker extension for VS Code** installed from [Extension Marketplace](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker). + + ![Screenshot of VS code extension marketplace](images/install-docker-extension.webp) + +2. In the **File** menu, select **Open Folder**. Choose **Clone Git Repository** and paste this URL: [https://github.com/docker/getting-started-todo-app](https://github.com/docker/getting-started-todo-app) ![Screenshot of VS code showing how to clone a repository](images/clone-the-repo.webp?border=true) -2. Right-click the `Dockerfile` and select the **Build Image...** menu item. +3. Right-click the `Dockerfile` and select the **Build Image...** menu item. ![Screenshot of VS Code showing the right-click menu and "Build Image" menu item](images/build-vscode-menu-item.webp?border=true) -3. In the dialog that appears, enter a name of `DOCKER_USERNAME/getting-started-todo-app`, replacing `DOCKER_USERNAME` with your Docker username. +4. In the dialog that appears, enter a name of `DOCKER_USERNAME/getting-started-todo-app`, replacing `DOCKER_USERNAME` with your Docker username. -4. After pressing **Enter**, you'll see a terminal appear where the build will occur. Once it's completed, feel free to close the terminal. +5. After pressing **Enter**, you'll see a terminal appear where the build will occur. Once it's completed, feel free to close the terminal. -5. Open the Docker Extension for VS Code by selecting the Docker logo in the left nav menu. +6. Open the Docker Extension for VS Code by selecting the Docker logo in the left nav menu. -6. Find the image you created. It'll have a name of `docker.io/DOCKER_USERNAME/getting-started-todo-app`. +7. Find the image you created. It'll have a name of `docker.io/DOCKER_USERNAME/getting-started-todo-app`. -7. Expand the image to view the tags (or different versions) of the image. You should see a tag named `latest`, which is the default tag given to an image. +8. Expand the image to view the tags (or different versions) of the image. You should see a tag named `latest`, which is the default tag given to an image. -8. Right-click on the **latest** item and select the **Push...** option. +9. Right-click on the **latest** item and select the **Push...** option. ![Screenshot of the Docker Extension and the right-click menu to push an image](images/build-vscode-push-image.webp) -9. Press **Enter** to confirm and then watch as your image is pushed to Docker Hub. Depending on your upload speeds, it might take a moment to push the image. +10. Press **Enter** to confirm and then watch as your image is pushed to Docker Hub. Depending on your upload speeds, it might take a moment to push the image. Once the upload is finished, feel free to close the terminal. diff --git a/content/get-started/introduction/images/install-docker-extension.webp b/content/get-started/introduction/images/install-docker-extension.webp new file mode 100644 index 000000000000..75f3659d7cc8 Binary files /dev/null and b/content/get-started/introduction/images/install-docker-extension.webp differ diff --git a/content/manuals/desktop/release-notes.md b/content/manuals/desktop/release-notes.md index 5b49742ae158..f6671b0724f3 100644 --- a/content/manuals/desktop/release-notes.md +++ b/content/manuals/desktop/release-notes.md @@ -174,6 +174,24 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec - Fixed a bug preventing UDP port 53 to be bound. - Fixed a bug where Windows daemon options were overwritten at startup. +## 4.35.2 + +{{< release-date date="2025-01-09" >}} + +{{< desktop-install-v2 mac=true version="4.35.2" build_path="/179656/" >}} + +### Bug fixes and enhancements + +#### For Mac + +- Prevents a bug that caused Docker Desktop to not update `com.docker.vmnetd` or `com.docker.socket` to newer versions. + +### Known issues + +#### For Mac + +- If you’re seeing a security popup about malware on `com.docker.vmnetd` or `com.docker.socket`, follow the steps documented in [docker/for-mac#7527](https://github.com/docker/for-mac/issues/7527). + ## 4.35.1 {{< release-date date="2024-10-30" >}}