From 23589f14d261b3ece1234e76c30e6159f1769c4a Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Mon, 21 Apr 2025 09:06:29 -0400 Subject: [PATCH 1/6] security: caveats for admin-settings.json (#22441) ## Description - admin-settings.json required sign in & business subscription, or the file will not apply settings - updated prereqs to be clearer, added a known limitations section for air-gapped containers or regulated environments that can't authenticate ## Related issues or tickets - [ENGDOCS-2563](https://docker.atlassian.net/browse/ENGDOCS-2563) ## Reviews - [ ] Product review - [ ] Editorial review [ENGDOCS-2563]: https://docker.atlassian.net/browse/ENGDOCS-2563?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --------- Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> --- .../settings-management/configure-json-file.md | 18 +++++++++++++++++- hugo_stats.json | 4 ++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md index 9b61004cf50f..0096692d5a89 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md @@ -17,7 +17,23 @@ Settings Management is designed specifically for organizations who don’t give ## Prerequisites -You first need to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) to ensure that all Docker Desktop developers authenticate with your organization. Since Settings Management requires a Docker Business subscription, enforced sign-in guarantees that only authenticated users have access and that the feature consistently takes effect across all users, even though it may still work without enforced sign-in. +You must [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) to ensure that all Docker Desktop users authenticate with your organization. + +Settings management requires a Docker Business subscription. Docker Desktop verifies the user's authentication and licensing before applying any settings from the `admin-settings.json` file. The settings file will not take effect unless both authentication and license checks pass. These checks ensure that only licensed users receive managed settings. + +> [!IMPORTANT] +> +> If a user is not signed in, or their Docker ID does not belong to an organization with a Docker Business subscription, Docker Desktop ignores the `admin-settings.json` file. + + +## Known limitations + +The `admin-settings.json` file requires users to authenticate with Docker Hub and be a member +of an organization with a Docker Business subscription. This means the file does not work in: + +- Air-grapped or offline environments where Docker Desktop can't authenticate with Docker Hub. +- Restricted environments where SSO and cloud-based authentication are not permitted. + ## Step one: Create the `admin-settings.json` file and save it in the correct location diff --git a/hugo_stats.json b/hugo_stats.json index a01b564ea82f..c940976a29e3 100644 --- a/hugo_stats.json +++ b/hugo_stats.json @@ -13,6 +13,7 @@ "-v", "-z-10", ".NET", + "AWS-Route-53", "Admin-Console", "After", "Angular", @@ -53,6 +54,8 @@ "Git-Bash-CLI", "GitLab", "Go", + "GoDaddy", + "Google-Cloud-DNS", "HTTP", "Heredocs", "Hyper-V-backend-x86_64", @@ -82,6 +85,7 @@ "Okta", "Okta-SAML", "Old-Dockerfile", + "Other-providers", "PHP", "PowerShell", "PowerShell-CLI", From e73846d9bb38ddd7bc30133aa33f82ea45a9ce13 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Tue, 22 Apr 2025 09:10:25 +0100 Subject: [PATCH 2/6] rm: projects docs (#22445) ## Description Removes project docs. They have been archived into the team's google drive ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/_index.md | 4 - content/manuals/projects/_index.md | 53 ------------- content/manuals/projects/about.md | 45 ----------- content/manuals/projects/edit.md | 47 ----------- content/manuals/projects/faq.md | 22 ------ content/manuals/projects/manage.md | 37 --------- content/manuals/projects/open.md | 121 ----------------------------- content/manuals/projects/share.md | 27 ------- content/manuals/projects/view.md | 80 ------------------- 9 files changed, 436 deletions(-) delete mode 100644 content/manuals/projects/_index.md delete mode 100644 content/manuals/projects/about.md delete mode 100644 content/manuals/projects/edit.md delete mode 100644 content/manuals/projects/faq.md delete mode 100644 content/manuals/projects/manage.md delete mode 100644 content/manuals/projects/open.md delete mode 100644 content/manuals/projects/share.md delete mode 100644 content/manuals/projects/view.md diff --git a/content/manuals/_index.md b/content/manuals/_index.md index b50d64a98b78..d7f80dbc4907 100644 --- a/content/manuals/_index.md +++ b/content/manuals/_index.md @@ -59,10 +59,6 @@ params: description: Run integration tests, with real dependencies, in the cloud. icon: package_2 link: https://testcontainers.com/cloud/docs/ - - title: Docker Projects - description: Use a unified, project-based workflow to run your containerized projects. - icon: folder - link: /projects/ platform: - title: Administration description: Centralized observability for companies and organizations. diff --git a/content/manuals/projects/_index.md b/content/manuals/projects/_index.md deleted file mode 100644 index 535b2d28c59e..000000000000 --- a/content/manuals/projects/_index.md +++ /dev/null @@ -1,53 +0,0 @@ ---- -title: Docker Projects -params: - sidebar: - group: Products - badge: - color: blue - text: Beta -weight: 50 -sitemap: false -description: Learn how to use Docker Projects which provides a unified, project-based workflow to run your containerized projects. -keywords: Docker, projects, docker deskotp, containerization -grid: -- title: How Docker Projects works - description: Learn How Docker Projects works - icon: category - link: /projects/about/ -- title: Open a new project - description: Learn how to open a new local or remote projects. - icon: checklist - link: /projects/open/ -- title: Edit your project - description: Edit your project's run commands and setup. N - icon: design_services - link: /projects/edit/ -- title: Manage your projects - description: Run or remove your projects. - icon: tune - link: /projects/manage/ -- title: View your projects - description: View detailed information about your projects and services within your projects - icon: visibility - link: /projects/view/ -- title: FAQs - description: View common FAQs about Docker Projects - icon: help - link: /projects/faq/ ---- - -{{< summary-bar feature_name="Docker Projects" >}} - -Docker Projects provides a simplified, project-based workflow for running and managing containerized applications. It organizes your code, configurations, and logs across local and cloud environments into a single view, making it easy to collaborate and share across teams. - -A project organizes your code and Docker artifacts into a single object. These artifacts include logs as well as customizable run commands. These artifacts can persist remotely in the cloud, which lets you access your projects from any device that has Docker Desktop. - -### Key features and benefits - - - One-click project setup: Open a local folder or clone a Git repository and run your project instantly. - - Minimal Docker expertise required: Ideal for both beginners and experienced developers. - - Custom `run` commands for your projects: Define and store pre-configured `run` commands that are equivalent to running `docker compose up`. - - Local and remote projects: Work on projects locally or sync artifacts to the cloud for cross-device access and easy collaboration. - -{{< grid >}} diff --git a/content/manuals/projects/about.md b/content/manuals/projects/about.md deleted file mode 100644 index d7f81fa1a6c7..000000000000 --- a/content/manuals/projects/about.md +++ /dev/null @@ -1,45 +0,0 @@ ---- -title: How it works -description: Understand how Docker Projects works -keywords: docker projects -weight: 10 ---- - -Docker Projects requires a Compose file (`compose.yml`) to define your application's services, networks, and configurations. When you open a project, Docker Projects automatically detects the Compose file, allowing you to configure and run services with pre-set commands. - -By integrating with Docker Compose, Docker Projects ensures a consistent, easy-to-manage workflow for both individual developers and teams. Whether you're starting a new project, configuring it, or collaborating with a team, Docker Projects keeps the process simple. - -Docker Projects works as follows: - -1. Create or open a project. You can: - - - Open a local project: Select a folder on your machine that contains your project code. - - Clone a Git repository: Provide a repository URL and clone the project into a local directory. - - Once a project is opened, Docker Desktop detects the Compose file and prepares the project for execution. - -2. Configure and run your project with pre-configured commands. These commands: - - - Work like `docker compose up`, launching services based on the Compose file. - - Can be customized with additional flags, multiple Compose files, and environment variables. - - Enable pre-run tasks, such as executing scripts before starting the services. - - All of which means you can fine-tune your configurations without manually running complex CLI commands. - -3. Collaborate and share with teams. For projects linked to a Git repository, Docker Projects stores artifacts in the cloud, enabling easy collaboration: - - - Work across devices: Open a project from any machine and instantly access stored configurations. - - Share configurations: Team members can access pre-defined run commands, reducing setup time. - - Collaboration is easy — new developers can join a team, open a project, and start working without complex setup steps. - -4. Manage and iterate. Once a project is up and running, Docker Projects makes it easy to monitor, update, and troubleshoot: - - - View logs to debug issues and track service activity. - - Edit configurations and run commands as requirements change. - -## What's next - - - [Learn how to open a new project](/manuals/projects/open.md) - - [Explore common FAQs](/manuals/projects/faq.md) - diff --git a/content/manuals/projects/edit.md b/content/manuals/projects/edit.md deleted file mode 100644 index 0021fe98f7a2..000000000000 --- a/content/manuals/projects/edit.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -title: Add or edit your run commands -description: Learn how to add or edit your run commands in Docker Projects -keywords: Docker, projects, docker deskotp, containerization, open, remote, local, run commands -weight: 40 ---- - -## Add a run command to a project - -1. Open an existing project and ensure that it is stopped. - -2. From the command drop-down menu, select **New run command**. - -3. Specify the following information for the run command: - - > [!TIP] - > - > While configuring your run command, you can view the equivalent `docker compose up` command in the **Run command** section on the configuration page. You can also use this command to run your project from the command line. You can refer to the [`docker compose up` reference documentation](/reference/cli/docker/compose/up.md) to learn more about the options you configure. - - - **Name**: Specify a name to identify the run command. - - **Compose files**: Select one or more Compose files from your project. - - **Flags**: Optionally, select one or more flags for your run command. - - > [!TIP] - > - > While the `--env-file` flag isn't currently supported, you can specify environment variables in your Compose file, or use the **Tasks** option to run a script that sets your environment variables. - - - **Services that will run**: After selecting one or more Compose files, the services defined in the files will appear here. If there is more than one service, you can optionally choose to not run a service by deselecting the checkbox. - - **Tasks (Advanced options)**: Optionally specify a command to run before running the project. For example, if you want to run a bash script from the project directory named `set-vars.sh`, you can specify bash `set-vars.sh`. Or, on Windows, to run a script with `cmd.exe` named `set-vars.bat`, specify `set-vars.bat`. Note that a task can access environment variables from your terminal profile, but it can't access local shell functions nor aliases. - -4. Select **Save changes**. - -You can now select the new run command from the drop-down menu after opening the project. - -## Edit a run command - -1. Open an existing project and ensure that it is stopped. - -2. Select the run command you want to change from the command drop-down menu. - -3. Select the **Edit** icon next to the **Run** button. - -4. Specify your changes and then select **Save changes**. - -## What's next? - - - [Manage your projects](/manuals/projects/manage.md) \ No newline at end of file diff --git a/content/manuals/projects/faq.md b/content/manuals/projects/faq.md deleted file mode 100644 index 88628a555067..000000000000 --- a/content/manuals/projects/faq.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -title: Docker Projects FAQs -linkTitle: FAQs -description: Find common FAQs for Docker Projects -keywords: faqs, docker projects, local, remote -weight: 70 ---- - -## Why is a Compose file required? - -A Compose file (`compose.yml`) defines how your application's containers should run together, including: - - - Services (e.g., web, database, API) - - Networks for inter-container communication - - Volumes for persistent data storage - - Environment variables and configurations - -Without a Compose file, Docker Projects doesn't have a way to understand how your application should be structured or executed. - -## What if my project doesn’t have a Compose file? - -If your project doesn't include a `compose.yml` file, you need to create one before opening it in Docker Projects. \ No newline at end of file diff --git a/content/manuals/projects/manage.md b/content/manuals/projects/manage.md deleted file mode 100644 index 097b609d819c..000000000000 --- a/content/manuals/projects/manage.md +++ /dev/null @@ -1,37 +0,0 @@ ---- -title: Manage your projects -description: Learn how to delete or completely remove a project. -keywords: Docker, projects, docker deskotp, containerization, open, remote, local -weight: 50 ---- - -## Run a project or service - -1. Open a new or existing project. - -2. Select a run command from the drop-down menu. - -3. Select the **Run** button for the project or the **Play** button next to the service you'd like to run. - -## Stop or restart a project or service - -1. Open an existing project that is running. - -2. Select the **Stop** or **Restart** button for the project or the appropriate button next to the service. - -## Remove a project from Docker Desktop - -If a project is associated with a Git repository, you can remove it from Docker Desktop. When a project is deleted, you can no longer run the project from the **Projects** view, but its run configuration still exists remotely in the cloud. - -This means that you can later [open the project](/manuals/projects/open.md#open-an-existing-remote-project) and associate it with the remote run configuration without having to specify the run command again. -None of your local code is deleted when removing a project from Docker Desktop. - -To remove a project from Docker Desktop: - -1. Sign in to Docker Desktop, and go to **Projects**. - -2. Select the **More actions** menu next to the project, and then select **Remove from Docker Desktop**. - -## Delete a project - -Deleting a project removes it from Docker Desktop and deletes all configuration locally and remotely from the cloud. When a project is deleted, you can no longer run the project from the **Projects** view. None of your local code is deleted when you delete a project from Docker Desktop. diff --git a/content/manuals/projects/open.md b/content/manuals/projects/open.md deleted file mode 100644 index 001c06c3c913..000000000000 --- a/content/manuals/projects/open.md +++ /dev/null @@ -1,121 +0,0 @@ ---- -title: Open a new project -description: Learn how to open a new local or remote project, or an existing project in Docker Projects. -keywords: Docker, projects, docker deskotp, containerization, open, remote, local -weight: 20 ---- - -> [!IMPORTANT] -> -> To use Docker Projects, you must enable the **Access experimental features** setting in Docker Desktop. See [Features in development](/manuals/desktop/settings-and-maintenance/settings.md#features-in-development) for more information. - -## New projects - -To run a new project, it must be stored locally. In the **Projects** view in Docker Desktop, local projects display the local path under the project. - -### Open a new local project - -A project consists of your code and at least one Compose file. Ensure that you have a Compose file before trying to open a new project. - -To open a new project: - -1. Sign in to Docker Desktop, and go to **Projects**. - -2. Select **Open a local folder**. This lets you select a local folder that contains your project’s code and a Compose file. - - > [!NOTE] - > - > A local folder can also be the folder of a Git repository that you have already cloned. - -3. Configure your project by giving it a name and setting the owner, then select **Next**. - - > [!NOTE] - > - > If you are part of a Docker organization you have the option to [share your project](share.md) with the organization. - -4. Specify how to run your project by selecting **New run command**: - - > [!TIP] - > - > While configuring your run command, you can view the equivalent `docker compose up` command in the **Run command** section on the configuration page. You can also use this command to run your project from the command line. You can refer to the [`docker compose up` reference documentation](/reference/cli/docker/compose/up.md) to learn more about the options you configure. - - - **Name**: Specify a name to identify the run command. - - **Compose files**: Select one or more Compose files from your project. - - **Flags**: Optionally, select one or more flags for your run command. - - > [!TIP] - > - > While the `--env-file` flag isn't currently supported, you can specify environment variables in your Compose file, or use the **Tasks** option to run a script that sets your environment variables. - - - **Services that will run**: After selecting one or more Compose files, the services defined in the files will appear here. If there is more than one service, you can optionally choose to not run a service by deselecting the checkbox. - - **Tasks (Advanced options)**: Optionally specify a command to run before running the project. For example, if you want to run a bash script from the project directory named `set-vars.sh`, you can specify bash `set-vars.sh`. Or, on Windows, to run a script with `cmd.exe` named `set-vars.bat`, specify `set-vars.bat`. Note that a task can access environment variables from your terminal profile, but it can't access local shell functions nor aliases. - -5. Select **Save changes**. - -Your project is now ready to run. - -### Open a new remote project - -The following steps prompt you to clone the Git repository for your project. - -If you have already cloned the repository outside of Docker Projects, then you can open the project as a new project and Docker Projects will automatically detect and link the repository. - -To clone and open a remote project: - -1. Sign in to Docker Desktop, and go to **Projects**. - -2. Select **Clone a git repository**. This lets you specify a Git repository and a local folder to clone that repository to. The repository must contain at least your project’s code and a Compose file. - -3. Enter the remote source and choose the local destination to clone to. - -4. Select **Clone project**. - -5. Configure your project by giving it a name and setting the owner, then select **Next**. - - > [!NOTE] - > - > If you are part of a Docker organization you have the option to [share your project](share.md) with the organization. - -6. Specify how to run your project by selecting **New run command**: - - > [!TIP] - > - > While configuring your run command, you can view the equivalent `docker compose up` command in the **Run command** section on the configuration page. You can also use this command to run your project from the command line. You can refer to the [`docker compose up` reference documentation](/reference/cli/docker/compose/up.md) to learn more about the options you configure. - - - **Name**: Specify a name to identify the run command. - - **Compose files**: Select one or more Compose files from your project. - - **Flags**: Optionally, select one or more flags for your run command. - - > [!TIP] - > - > While the `--env-file` flag isn't currently supported, you can specify environment variables in your Compose file, or use the **Tasks** option to run a script that sets your environment variables. - - - **Services that will run**: After selecting one or more Compose files, the services defined in the files will appear here. If there is more than one service, you can optionally choose to not run a service by deselecting the checkbox. - - **Tasks (Advanced options)**: Optionally specify a command to run before running the project. For example, if you want to run a bash script from the project directory named `set-vars.sh`, you can specify bash `set-vars.sh`. Or, on Windows, to run a script with `cmd.exe` named `set-vars.bat`, specify `set-vars.bat`. Note that a task can access environment variables from your terminal profile, but it can't access local shell functions nor aliases. - -7. Select **Save changes**. - -## Existing projects - -### Open an existing local project - -1. Sign in to Docker Desktop, and go to **Projects**. - -2. Open your project by selecting your project under **Recents**, or by selecting the specific owner that your project is associated with and then select your project. - -### Open an existing remote project - -In the **Projects** view in Docker Desktop, existing remote projects display **No local copy** under the project. - -You’ll see remote projects when you are new to the team and are accessing a shared project, remove a project from Docker Desktop, or access Docker Desktop from a new device after creating a project associated with a Git repository. - -To open an existing remote project, you can choose between: - - - Cloning the project into a local destination. - - Linking to an existing folder where the project has already been cloned - -## What's next? - - - [View your project](/manuals/projects/view.md) - - [Add or edit your run commands](/manuals/projects/edit.md) - - [Manage your projects](/manuals/projects/manage.md) diff --git a/content/manuals/projects/share.md b/content/manuals/projects/share.md deleted file mode 100644 index 70d7ee73ea9b..000000000000 --- a/content/manuals/projects/share.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -title: Share and collaborate on a project -linkTitle: Collaborate -description: Learn how to collaborate on a project -keywords: collaborate, projects, docker desktop, local, remote -weight: 60 ---- - -Docker Projects makes it easy for teams to share, manage, and collaborate on containerized applications. - -Collaboration is managed by associating a project with a Docker organization, and leveraging cloud-stored configurations. This allows team members to easily access and work on the same project without needing extensive manual setup. - -Once a project is associated with an organization, other team members can access it by: - -1. Signing into Docker Desktop and navigating to **Projects**. - -2. Selecting the correct organization tab. - -3. Selecting the project from the list of shared projects. - -4. Cloning the project into a local destination. - -## What's next - - - [View your project](/manuals/projects/view.md) - - [Add or edit your run commands](/manuals/projects/edit.md) - - [Manage your projects](/manuals/projects/manage.md) diff --git a/content/manuals/projects/view.md b/content/manuals/projects/view.md deleted file mode 100644 index 3e45b5490b44..000000000000 --- a/content/manuals/projects/view.md +++ /dev/null @@ -1,80 +0,0 @@ ---- -title: View your project -description: View information about your project or the services within your project. -keywords: containers, docker projects, local, remote, docker desktop -weight: 30 ---- - -## View a project’s README - -If a project has a README file, you can view it via Docker Projects. Note that the README tab is only visible if the project has a README file. - -To view a project’s README, open a new or existing project and then select the README tab. - -## View logs for a project - -1. Open a new or existing project. - -2. Select the **Logs** tab to see all project logs. - -3. Optionally, use the menu in the top right corner of the logs to copy the logs to your clipboard or clear the logs. - -## View service-level information - -With Docker Projects, you can view the following information about your containers within your project: - - - Logs - - Image - - Files - - Network - - Environment variables - -From the **Exec** tab, you can use the integrated terminal, on a running container, directly within Docker Desktop. You are able to quickly run commands within your container so you can understand its current state or debug when something goes wrong. - -### Logs - -Select **Logs** to see logs from the containers in your project. You can also: - -- Use `Cmd + f`/`Ctrl + f` to open the search bar and find specific entries. - Search matches are highlighted in yellow. -- Press `Enter` or `Shift + Enter` to jump to the next or previous search match - respectively. -- Use the **Copy** icon in the top right-hand corner to copy all the logs to - your clipboard. -- Automatically copy any logs content by highlighting a few lines or a section - of the logs. -- Use the **Clear terminal** icon in the top right-hand corner to clear the - logs terminal. -- Select and view external links that may be in your logs. - -### Image - -The **Image** tab in Docker Projects provides details about the Docker image associated with a service. It helps you verify which image is being used, when it was last built, and where the corresponding Dockerfile is located. - -It also provides quick access to inspect the image or open the Dockerfile for modifications. - -### Files - -Select **Files** to explore the filesystem of running or stopped containers in your project. You -can also: - - - See which files have been recently added, modified, or deleted - - Edit a file straight from the built-in editor - - Drag and drop files and folders between the host and the container - - Delete unnecessary files when you right-click on a file - - Download files and folders from the container straight to the host - -### Network - -The **Network** tab in Docker Projects provides an overview of how the containerized services communicate with each other and the host system. It displays the assigned network name, connected services, and mapped container ports. - -If a service is mapped to a host port, you can select the link to open it in a browser - -### Environment variables - -The **Env** tab in Docker Projects displays the environment variables available to a service. These variables help configure the runtime environment without modifying the container image. - -## What's next? - - - [Add or edit your run commands](/manuals/projects/edit.md) - - [Manage your projects](/manuals/projects/manage.md) From 4f7b212c9a41ee4b022038e9970734117bc7126e Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Tue, 22 Apr 2025 11:38:36 +0300 Subject: [PATCH 3/6] Fix the link to the "Running containers" documentation in the "Using lifecycle hooks with Compose" manual (#22451) ## Description [The current documentation link](https://github.com/manuals//engine/containers/run.md#default-command-and-options) responds with `Not Found`. See the available manuals for containers [here](https://github.com/docker/docs/tree/main/content/manuals/engine/containers). --------- Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> --- content/manuals/compose/how-tos/lifecycle.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/compose/how-tos/lifecycle.md b/content/manuals/compose/how-tos/lifecycle.md index ef43083d520b..d60a942d9691 100644 --- a/content/manuals/compose/how-tos/lifecycle.md +++ b/content/manuals/compose/how-tos/lifecycle.md @@ -11,7 +11,7 @@ keywords: cli, compose, lifecycle, hooks reference ## Services lifecycle hooks When Docker Compose runs a container, it uses two elements, -[ENTRYPOINT and COMMAND](https://github.com/manuals//engine/containers/run.md#default-command-and-options), +[ENTRYPOINT and COMMAND](/manuals/engine/containers/run.md#default-command-and-options), to manage what happens when the container starts and stops. However, it can sometimes be easier to handle these tasks separately with lifecycle hooks - From 211733e3d35dabe7ffa39b9f5155d3239776c337 Mon Sep 17 00:00:00 2001 From: Jakub Meysner Date: Tue, 22 Apr 2025 10:47:47 +0200 Subject: [PATCH 4/6] Fix typos in wasm.md (#22455) ## Description Fix 2 small typos in the Wasm workloads doc. ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/desktop/features/wasm.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manuals/desktop/features/wasm.md b/content/manuals/desktop/features/wasm.md index eba9c67ed008..35df7ca492c2 100644 --- a/content/manuals/desktop/features/wasm.md +++ b/content/manuals/desktop/features/wasm.md @@ -15,7 +15,7 @@ params: {{< summary-bar feature_name="Wasm workloads" >}} -WebAssembly (Wasm) is a fast, light alternative Linux and +WebAssembly (Wasm) is a fast, light alternative to Linux and Windows containers. With Docker Desktop, you can now run Wasm workloads side by side with traditional containers. This page provides information about the ability to run Wasm applications @@ -93,7 +93,7 @@ Start the application using the normal Docker Compose commands: ### Running a multi-service application with Wasm -Networking works the same as you expect with Linux containers, giving you the +Networking works the same as you'd expect with Linux containers, giving you the flexibility to combine Wasm applications with other containerized workloads, such as a database, in a single application stack. From 452734fa3a83777b1b16af52ce4b57a08a376ee8 Mon Sep 17 00:00:00 2001 From: karman <110832017+karman-docker@users.noreply.github.com> Date: Tue, 22 Apr 2025 09:07:29 +0000 Subject: [PATCH 5/6] call out the behavior when PAC file download fails (#22464) ## Description ## Related issues or tickets https://docker.slack.com/archives/C02DDPKLJ0J/p1744707532756369?thread_ts=1744293644.289759&cid=C02DDPKLJ0J ## Reviews - [ ] Technical review - [x] Editorial review - [ ] Product review --- .../for-admins/hardened-desktop/air-gapped-containers.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/manuals/security/for-admins/hardened-desktop/air-gapped-containers.md b/content/manuals/security/for-admins/hardened-desktop/air-gapped-containers.md index 8c980376b682..595493ef4d92 100644 --- a/content/manuals/security/for-admins/hardened-desktop/air-gapped-containers.md +++ b/content/manuals/security/for-admins/hardened-desktop/air-gapped-containers.md @@ -52,6 +52,7 @@ The `containersProxy` setting describes the policy which is applied to traffic f > [!IMPORTANT] > > Any existing `proxy` setting in the `admin-settings.json` file continues to apply to traffic from the app on the host. +> If the PAC file download fails, the Docker Desktop app and its containers do not block the request; instead, they attempt to connect directly to the target URL. ## Example PAC file From 8339b4473e7ded0b41e03f7652d3b6e3040a84a6 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Tue, 22 Apr 2025 11:10:09 +0200 Subject: [PATCH 6/6] release-notes for Compose v2.35.1 version (#22456) ## Description Add release notes for latest Compose release `v2.35.1` ## Related issues or tickets N/A ## Reviews - [ ] Technical review - [x] Editorial review - [ ] Product review Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- _vendor/modules.txt | 4 ++-- .../manuals/compose/releases/release-notes.md | 23 ++++++++++++++++--- go.mod | 6 ++--- go.sum | 2 ++ hugo.yaml | 2 +- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/_vendor/modules.txt b/_vendor/modules.txt index e578e9d82872..ca334bf0d1a8 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v28.1.0-rc.2+incompatible # github.com/moby/buildkit v0.21.0 # github.com/docker/buildx v0.23.0 -# github.com/docker/cli v28.1.0-rc.2+incompatible -# github.com/docker/compose/v2 v2.35.0 +# github.com/docker/cli v28.1.0+incompatible +# github.com/docker/compose/v2 v2.35.1 # github.com/docker/scout-cli v1.15.0 diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index 3b59ca3b7474..c8e6064da395 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -13,6 +13,23 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). +## 2.35.1 + +{{< release-date date="2025-04-17" >}} + +### Bug fixes and enhancements + +- Fixed an issue with bind mounts + +### Update + +- Dependencies upgrade: bump compose-go to v2.6.0 +- Dependencies upgrade: bump docker engine and cli to v28.0.4 +- Dependencies upgrade: bump buildx to v0.22.0 + + + + ## 2.35.0 {{< release-date date="2025-04-10" >}} @@ -30,9 +47,9 @@ For more detailed information, see the [release notes in the Compose repo](https ### Update -- Dependencies upgrade: bump compose-go to v2.6.0 -- Dependencies upgrade: bump docker engine and cli to v28.0.4 -- Dependencies upgrade: bump buildx to v0.22.0 +- Dependencies upgrade: bump docker engine and cli to v28.1.0 +- Dependencies upgrade: bump buildx to v0.23.0 +- Dependencies upgrade: bump buildkit to v0.21.0 ## 2.34.0 diff --git a/go.mod b/go.mod index 8cbd447281bd..155f635ef101 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ toolchain go1.24.1 require ( github.com/docker/buildx v0.23.0 // indirect - github.com/docker/cli v28.1.0-rc.2+incompatible // indirect - github.com/docker/compose/v2 v2.35.0 // indirect + github.com/docker/cli v28.1.0+incompatible // indirect + github.com/docker/compose/v2 v2.35.1 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.21.0 // indirect github.com/moby/moby v28.1.0-rc.2+incompatible // indirect @@ -16,7 +16,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.23.0 github.com/docker/cli => github.com/docker/cli v28.1.0-rc.2+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.35.0 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.35.1 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.20.0 github.com/moby/moby => github.com/moby/moby v28.1.0-rc.2+incompatible diff --git a/go.sum b/go.sum index f08edec55f5c..e0d9918a4407 100644 --- a/go.sum +++ b/go.sum @@ -229,6 +229,8 @@ github.com/docker/compose/v2 v2.34.0 h1:mUhgA6AiRVO9hEndD2G2oOQi5Y0g/4H8xSPVUc5T github.com/docker/compose/v2 v2.34.0/go.mod h1:TgTD4Ku0vOSB3NZgOXp6HcCE6wDSBjg7r8bjWraV5/4= github.com/docker/compose/v2 v2.35.0 h1:bU23OeFrbGyHYrKijMSEwkOeDg2TLhAGntU2F3hwX1o= github.com/docker/compose/v2 v2.35.0/go.mod h1:S5ejUILn9KTYC6noX3IxznWu3/sb3FxdZqIYbq4seAk= +github.com/docker/compose/v2 v2.35.1 h1:oRt5EE22een6DEAkNNQcuzJGhBS2rcMtEKdbfMhFIgk= +github.com/docker/compose/v2 v2.35.1/go.mod h1:Ydd9ceg7VBOPSVAsDDKfyGGAkjejH3cD91GSmHjuRhI= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= diff --git a/hugo.yaml b/hugo.yaml index c479873e4bf4..f858b1c35c74 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -139,7 +139,7 @@ params: # (Used to show e.g., "latest" and "latest"-1 in engine install examples docker_ce_version_prev: "28.1.0" # Latest Docker Compose version - compose_version: "v2.35.0" + compose_version: "v2.35.1" # Latest BuildKit version buildkit_version: "0.21.0"