From 7272af99459fdedeb04a21a9c191def70d88035f Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Tue, 26 Mar 2024 12:18:45 +0100 Subject: [PATCH] engine: clarify licensing terms of use for docker-ce when used via DD Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/engine/_index.md | 11 +++------ content/engine/install/_index.md | 41 +++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/content/engine/_index.md b/content/engine/_index.md index f8269bf1204e..b9aacc65fdf8 100644 --- a/content/engine/_index.md +++ b/content/engine/_index.md @@ -66,12 +66,7 @@ such as images, containers, networks, and volumes. For more details, see [Docker Architecture](../get-started/overview.md#docker-architecture). -{{< grid >}} - -## Licensing +Use of Docker Engine or Docker CLI through Docker Desktop is subject to the +[licensing terms](./install/_index.md#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. +{{< grid >}} diff --git a/content/engine/install/_index.md b/content/engine/install/_index.md index d345d7c961d8..df3744e2a79e 100644 --- a/content/engine/install/_index.md +++ b/content/engine/install/_index.md @@ -104,12 +104,51 @@ For information about the open source project, refer to the Patch releases are always backward compatible with its major and minor version. -### Licensing +## 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 Desktop (which includes Docker Engine and Docker CLI) +requires a [paid subscription](https://www.docker.com/pricing/) +in enterprises exceeding 250 employees OR with annual revenue surpassing $10 million USD. + +To check if you're using Docker Engine through Docker Desktop, +run the `docker version` command and inspect the server version. + +```console {hl_lines=12} +$ docker version +Client: + Cloud integration: v1.0.35+desktop.13 + Version: 26.0.0 + API version: 1.45 + Go version: go1.21.8 + Git commit: 2ae903e + Built: Wed Mar 20 15:14:46 2024 + OS/Arch: darwin/arm64 + Context: desktop-linux + +Server: Docker Desktop 4.29.0 (143713) + Engine: + Version: 26.0.0 + API version: 1.45 (minimum version 1.24) + Go version: go1.21.8 + Git commit: 8b79278 + Built: Wed Mar 20 15:18:02 2024 + OS/Arch: linux/arm64 + Experimental: false + containerd: + Version: 1.6.28 + GitCommit: ae07eda36dd25f8a1b98dfbf587313b99c0190bb + runc: + Version: 1.1.12 + GitCommit: v1.1.12-0-g51d5e94 + docker-init: + Version: 0.19.0 + GitCommit: de40ad0 +``` + ## Reporting security issues If you discover a security issue, we request that you bring it to our attention immediately.