diff --git a/.vscode/docker.code-snippets b/.vscode/docker.code-snippets index d594449496..1c2817d418 100644 --- a/.vscode/docker.code-snippets +++ b/.vscode/docker.code-snippets @@ -59,4 +59,9 @@ "body": ["Visual Studio Code"], "description": "Insert 'Visual Studio Code'", }, + "Insert reusable snippet": { + "prefix": ["include","reuse"], + "body": ["{{% include \"$1\" %}}"], + "description": "Insert a reusable snippet stored in the `includes` folder", + } } \ No newline at end of file diff --git a/content/includes/engine-license.md b/content/includes/engine-license.md new file mode 100644 index 0000000000..050799b4f9 --- /dev/null +++ b/content/includes/engine-license.md @@ -0,0 +1 @@ +Apache License, Version 2.0. See [LICENSE](https://github.com/moby/moby/blob/master/LICENSE) for the full license. \ No newline at end of file diff --git a/content/manuals/engine/_index.md b/content/manuals/engine/_index.md index febf3717d8..62de47b3f7 100644 --- a/content/manuals/engine/_index.md +++ b/content/manuals/engine/_index.md @@ -74,8 +74,7 @@ For more details, see ## Licensing -The Docker Engine is licensed under the Apache License, Version 2.0. See -[LICENSE](https://github.com/moby/moby/blob/master/LICENSE) for the full license -text. - -However, for commercial use of Docker Engine obtained via Docker Desktop within larger enterprises (exceeding 250 employees OR with annual revenue surpassing $10 million USD), a [paid subscription](https://www.docker.com/pricing/) is required. +Commercial use of Docker Engine obtained via Docker Desktop +within larger enterprises (exceeding 250 employees OR with annual revenue surpassing +$10 million USD), requires a [paid subscription](https://www.docker.com/pricing/). +Apache License, Version 2.0. See [LICENSE](https://github.com/moby/moby/blob/master/LICENSE) for the full license. diff --git a/content/manuals/engine/install/_index.md b/content/manuals/engine/install/_index.md index 73a53e4237..379fed3851 100644 --- a/content/manuals/engine/install/_index.md +++ b/content/manuals/engine/install/_index.md @@ -60,7 +60,7 @@ Click on a platform's link to view the relevant installation procedure. > While the following instructions may work, Docker doesn't test or verify > installation on distribution derivatives. -- If you use Debian derivatives such as "BunsenLabs Linux", "Kali Linux" or +- If you use Debian derivatives such as "BunsenLabs Linux", "Kali Linux" or "LMDE" (Debian-based Mint) should follow the installation instructions for [Debian](debian.md), substitute the version of your distribution for the corresponding Debian release. Refer to the documentation of your distribution to find @@ -107,9 +107,10 @@ Patch releases are always backward compatible with its major and minor version. ### Licensing -Docker Engine is licensed under the Apache License, Version 2.0. See -[LICENSE](https://github.com/moby/moby/blob/master/LICENSE) for the full -license text. +Commercial use of Docker Engine obtained via Docker Desktop +within larger enterprises (exceeding 250 employees OR with annual revenue surpassing +$10 million USD), requires a [paid subscription](https://www.docker.com/pricing/). +Apache License, Version 2.0. See [LICENSE](https://github.com/moby/moby/blob/master/LICENSE) for the full license. ## Reporting security issues diff --git a/content/manuals/engine/install/centos.md b/content/manuals/engine/install/centos.md index d01ae2aaef..37c1715129 100644 --- a/content/manuals/engine/install/centos.md +++ b/content/manuals/engine/install/centos.md @@ -75,6 +75,8 @@ You can install Docker Engine in different ways, depending on your needs: - In testing and development environments, you can use automated [convenience scripts](#install-using-the-convenience-script) to install Docker. +{{% include "engine-license.md" %}} + ### Install using the rpm repository {#install-using-the-repository} Before you install Docker Engine for the first time on a new host machine, you diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md index 0ca59c2490..a1cc0bb90f 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -98,6 +98,8 @@ You can install Docker Engine in different ways, depending on your needs: - Use a [convenience script](#install-using-the-convenience-script). Only recommended for testing and development environments. +{{% include "engine-license.md" %}} + ### Install using the `apt` repository {#install-using-the-repository} Before you install Docker Engine for the first time on a new host machine, you diff --git a/content/manuals/engine/install/fedora.md b/content/manuals/engine/install/fedora.md index a81766f052..dc992d8083 100644 --- a/content/manuals/engine/install/fedora.md +++ b/content/manuals/engine/install/fedora.md @@ -72,6 +72,8 @@ You can install Docker Engine in different ways, depending on your needs: - In testing and development environments, you can use automated [convenience scripts](#install-using-the-convenience-script) to install Docker. +{{% include "engine-license.md" %}} + ### Install using the rpm repository {#install-using-the-repository} Before you install Docker Engine for the first time on a new host machine, you diff --git a/content/manuals/engine/install/raspberry-pi-os.md b/content/manuals/engine/install/raspberry-pi-os.md index 1399c73ce0..25472f7f47 100644 --- a/content/manuals/engine/install/raspberry-pi-os.md +++ b/content/manuals/engine/install/raspberry-pi-os.md @@ -98,6 +98,8 @@ You can install Docker Engine in different ways, depending on your needs: - Use a [convenience script](#install-using-the-convenience-script). Only recommended for testing and development environments. +{{% include "engine-license.md" %}} + ### Install using the `apt` repository {#install-using-the-repository} Before you install Docker Engine for the first time on a new host machine, you @@ -132,7 +134,7 @@ Docker from the repository. ```console $ sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin ``` - + {{< /tab >}} {{< tab name="Specific version" >}} diff --git a/content/manuals/engine/install/rhel.md b/content/manuals/engine/install/rhel.md index f76d01be5c..0f3c4c60e1 100644 --- a/content/manuals/engine/install/rhel.md +++ b/content/manuals/engine/install/rhel.md @@ -75,6 +75,8 @@ You can install Docker Engine in different ways, depending on your needs: - In testing and development environments, you can use automated [convenience scripts](#install-using-the-convenience-script) to install Docker. +{{% include "engine-license.md" %}} + ### Install using the rpm repository {#install-using-the-repository} Before you install Docker Engine for the first time on a new host machine, you diff --git a/content/manuals/engine/install/sles.md b/content/manuals/engine/install/sles.md index d32163c93f..fb6c252b6a 100644 --- a/content/manuals/engine/install/sles.md +++ b/content/manuals/engine/install/sles.md @@ -98,6 +98,8 @@ You can install Docker Engine in different ways, depending on your needs: - In testing and development environments, you can use automated [convenience scripts](#install-using-the-convenience-script) to install Docker. +{{% include "engine-license.md" %}} + ### Install using the rpm repository {#install-using-the-repository} Before you install Docker Engine for the first time on a new host machine, you @@ -139,7 +141,7 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo ```console $ sudo zypper search -s --match-exact docker-ce | sort -r - + v | docker-ce | package | 3:{{% param "docker_ce_version" %}}-1 | s390x | Docker CE Stable - s390x v | docker-ce | package | 3:{{% param "docker_ce_version_prev" %}}-1 | s390x | Docker CE Stable - s390x ``` @@ -160,7 +162,7 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo This command installs Docker, but it doesn't start Docker. It also creates a `docker` group, however, it doesn't add any users to the group by default. - + {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/engine/install/ubuntu.md b/content/manuals/engine/install/ubuntu.md index 94027a89a4..7c0e667abe 100644 --- a/content/manuals/engine/install/ubuntu.md +++ b/content/manuals/engine/install/ubuntu.md @@ -59,7 +59,7 @@ Docker Engine for Ubuntu is compatible with x86_64 (or amd64), armhf, arm64, s390x, and ppc64le (ppc64el) architectures. > [!NOTE] -> +> > Installation on Ubuntu derivative distributions, such as Linux Mint, is not officially > supported (though it may work). @@ -113,6 +113,8 @@ You can install Docker Engine in different ways, depending on your needs: - Use a [convenience script](#install-using-the-convenience-script). Only recommended for testing and development environments. +{{% include "engine-license.md" %}} + ### Install using the `apt` repository {#install-using-the-repository} Before you install Docker Engine for the first time on a new host machine, you @@ -147,7 +149,7 @@ Docker from the repository. ```console $ sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin ``` - + {{< /tab >}} {{< tab name="Specific version" >}}