From 0fac8a171f5dfa28e6ba3b0c2ff02bfe2f670e00 Mon Sep 17 00:00:00 2001 From: David Karlsson Date: Mon, 14 Nov 2022 16:03:10 +0100 Subject: [PATCH 001/103] add docker-ce-rootless-extras to uninstall command follow-up to #16148 --- engine/install/centos.md | 2 +- engine/install/fedora.md | 2 +- engine/install/rhel.md | 2 +- engine/install/sles.md | 2 +- engine/install/ubuntu.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/install/centos.md b/engine/install/centos.md index cb54951400..8ce55aa340 100644 --- a/engine/install/centos.md +++ b/engine/install/centos.md @@ -215,7 +215,7 @@ instead of `yum -y install`, and point to the new file. 1. Uninstall the Docker Engine, CLI, Containerd, and Docker Compose packages: ```console - $ sudo yum remove docker-ce docker-ce-cli containerd.io docker-compose-plugin + $ sudo yum remove docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-ce-rootless-extras ``` 2. Images, containers, volumes, or customized configuration files on your host diff --git a/engine/install/fedora.md b/engine/install/fedora.md index db3abf8b01..441c0b4eaa 100644 --- a/engine/install/fedora.md +++ b/engine/install/fedora.md @@ -210,7 +210,7 @@ instead of `dnf -y install`, and point to the new file. 1. Uninstall the Docker Engine, CLI, Containerd, and Docker Compose packages: ```console - $ sudo dnf remove docker-ce docker-ce-cli containerd.io docker-compose-plugin + $ sudo dnf remove docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-ce-rootless-extras ``` 2. Images, containers, volumes, or customized configuration files on your host diff --git a/engine/install/rhel.md b/engine/install/rhel.md index ea2f91717c..ee0de2d840 100644 --- a/engine/install/rhel.md +++ b/engine/install/rhel.md @@ -219,7 +219,7 @@ instead of `yum -y install`, and point to the new file. 1. Uninstall the Docker Engine, CLI, Containerd, and Docker Compose packages: ```console - $ sudo yum remove docker-ce docker-ce-cli containerd.io docker-compose-plugin + $ sudo yum remove docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-ce-rootless-extras ``` 2. Images, containers, volumes, or customized configuration files on your host diff --git a/engine/install/sles.md b/engine/install/sles.md index ceec99e720..e85e2078fc 100644 --- a/engine/install/sles.md +++ b/engine/install/sles.md @@ -237,7 +237,7 @@ instead of `zypper -y install`, and point to the new file. 1. Uninstall the Docker Engine, CLI, Containerd, and Docker Compose packages: ```console - $ sudo zypper remove docker-ce docker-ce-cli containerd.io docker-compose-plugin + $ sudo zypper remove docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-ce-rootless-extras ``` 2. Images, containers, volumes, or customized configuration files on your host diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md index 9344dc4e4f..e182a33731 100644 --- a/engine/install/ubuntu.md +++ b/engine/install/ubuntu.md @@ -254,7 +254,7 @@ To upgrade Docker Engine, download the newer package file and repeat the 1. Uninstall the Docker Engine, CLI, containerd, and Docker Compose packages: ```console - $ sudo apt-get purge docker-ce docker-ce-cli containerd.io docker-compose-plugin + $ sudo apt-get purge docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-ce-rootless-extras ``` 2. Images, containers, volumes, or custom configuration files on your host From 8baee04e900137730e6503b592d9661b32c8a1a5 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Thu, 5 Jan 2023 15:47:56 +0000 Subject: [PATCH 002/103] ENGDOCS-1063 (#16446) * ENGDOCS-1063 * edits --- compose/production.md | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/compose/production.md b/compose/production.md index a9d4601f24..f9de696919 100644 --- a/compose/production.md +++ b/compose/production.md @@ -14,24 +14,23 @@ up your application, you can run Compose apps on a Swarm cluster. ### Modify your Compose file for production -You probably need to make changes to your app configuration to make it ready for -production. These changes may include: +You may need to make changes to your app configuration to make it ready for +production. These changes might include: - Removing any volume bindings for application code, so that code stays inside the container and can't be changed from outside - Binding to different ports on the host - Setting environment variables differently, such as reducing the verbosity of logging, or to specify settings for external services such as an email server -- Specifying a restart policy like `restart: always` to avoid downtime +- Specifying a restart policy like [`restart: always`](compose-file/index.md#restart){: target="_blank" rel="noopener" class="_" } to avoid downtime - Adding extra services such as a log aggregator For this reason, consider defining an additional Compose file, say `production.yml`, which specifies production-appropriate -configuration. This configuration file only needs to include the changes you'd -like to make from the original Compose file. The additional Compose file -can be applied over the original `docker-compose.yml` to create a new configuration. +configuration. This configuration file only needs to include the changes you want to make from the original Compose file. The additional Compose file +is then applied over the original `docker-compose.yml` to create a new configuration. -Once you've got a second configuration file, tell Compose to use it with the +Once you have a second configuration file, you can use it with the `-f` option: ```console @@ -52,24 +51,21 @@ $ docker compose build web $ docker compose up --no-deps -d web ``` -This first rebuilds the image for `web` and then stop, destroy, and recreate -*just* the `web` service. The `--no-deps` flag prevents Compose from also +This first command rebuilds the image for `web` and then stops, destroys, and recreates +just the `web` service. The `--no-deps` flag prevents Compose from also recreating any services which `web` depends on. ### Running Compose on a single server You can use Compose to deploy an app to a remote Docker host by setting the `DOCKER_HOST`, `DOCKER_TLS_VERIFY`, and `DOCKER_CERT_PATH` environment variables -appropriately. See also [Compose CLI environment variables](../compose/reference/envvars.md). +appropriately. See also [Compose CLI environment variables](reference/envvars.md). Once you've set up your environment variables, all the normal `docker compose` commands work with no further configuration. -## Compose documentation +## What's new? -- [User guide](index.md) -- [Installing Compose](install/index.md) -- [Getting Started](gettingstarted.md) - [Command line reference](reference/index.md) - [Compose file reference](compose-file/index.md) - [Sample apps with Compose](samples-for-compose.md) From 380bf39b943201da19b537a71872c7a718d60922 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Fri, 6 Jan 2023 14:27:51 +0000 Subject: [PATCH 003/103] fix checksum accordions (#16441) * fix checksum accordions Co-authored-by: Sebastiaan van Stijn --- desktop/release-notes.md | 72 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/desktop/release-notes.md b/desktop/release-notes.md index b833e180b8..7d11d9a200 100644 --- a/desktop/release-notes.md +++ b/desktop/release-notes.md @@ -91,17 +91,17 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/ge > [RPM](https://desktop.docker.com/linux/main/amd64/91661/docker-desktop-4.14.1-x86_64.rpm) | > [Arch package](https://desktop.docker.com/linux/main/amd64/91661/docker-desktop-4.14.1-x86_64.pkg.tar.zst) -
+
-