From c206ce3dd1fdcea8e9f81daea93eceeb4e84eaf5 Mon Sep 17 00:00:00 2001 From: FerriolCalvet Date: Thu, 22 Jan 2026 15:22:28 +0100 Subject: [PATCH 1/9] fill basic information for Docker --- docs/Tools/Docker.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/Tools/Docker.md b/docs/Tools/Docker.md index c351c277a..dcf03dd55 100644 --- a/docs/Tools/Docker.md +++ b/docs/Tools/Docker.md @@ -1,6 +1,23 @@ # Docker +It's free for educational, personal use, research, non commercial use. + ## Description +* You cannot use Docker in the cluster. + +* But you can use Docker to create your custom containers locally. + +## Create Docker containers + +Internally we have this GitHub repository with the receipes for many of the custom containers that we are generating and hosting in our dockerhub. + +If you need/want to create a new container, you can follow guidelines on how is the most appropriate way of doing it, and once you have a working version of it, you must: + +* Add your Dockerfile and associated files required for generating the container to our [GitHub repository of containers](https://github.com/bbglab/containers-recipes). Make sure that your container is fully reproducible. + +* If appropriate ask some BBG member with permission to upload it to the lab [docker hub](https://hub.docker.com/u/bbglab). ## Reference + +- Ferriol Calvet From f88842fc6754c33d90e37f20dfd7ebd2cdfc401d Mon Sep 17 00:00:00 2001 From: FerriolCalvet Date: Thu, 22 Jan 2026 15:24:43 +0100 Subject: [PATCH 2/9] add link to the licensing restrictions --- docs/Tools/Docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Tools/Docker.md b/docs/Tools/Docker.md index dcf03dd55..557042b7c 100644 --- a/docs/Tools/Docker.md +++ b/docs/Tools/Docker.md @@ -1,6 +1,6 @@ # Docker -It's free for educational, personal use, research, non commercial use. +It's free for educational, personal use, research, non commercial use but check this for [an overview of the Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement/) in case any of this applies to the use that you want to make out of it. ## Description From cf8da4804feea188712c985f9bd0f2a4c0e8fdfe Mon Sep 17 00:00:00 2001 From: sofiathelima Date: Thu, 22 Jan 2026 15:55:27 +0100 Subject: [PATCH 3/9] clarify licensing provide links that clearly state licensing --- docs/Tools/Docker.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/Tools/Docker.md b/docs/Tools/Docker.md index 5629ff888..feb384e1e 100644 --- a/docs/Tools/Docker.md +++ b/docs/Tools/Docker.md @@ -1,6 +1,17 @@ # Docker -It's free for educational, personal use, research, non commercial use but check this for [an overview of the Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement/) in case any of this applies to the use that you want to make out of it. +Docker **Desktop** is free for educational, personal use, research, and non-commercial use, but check the [Docker Subscription Service Agreement overview](https://www.docker.com/legal/docker-subscription-service-agreement/) in case any of this applies to your intended use. + +## Licensing (Docker Engine vs Docker Desktop) + +The *Docker Engine* (the runtime/daemon `dockerd` and related components) is open source and distributed under the **Apache License 2.0** (a permissive license). Docker explicitly documents this in the Docker Engine manual: + +- Docker Engine licensing: https://docs.docker.com/engine/#licensing +- Docker Engine upstream license (Moby project): https://github.com/moby/moby/blob/master/LICENSE + +Note: Docker Desktop is a separate product with its own subscription/license terms; Docker also notes that the licensing terms for the Docker/Moby open-source projects (such as Docker Engine) aren’t changing: + +- Docker Desktop license agreement note: https://docs.docker.com/subscription/desktop-license/ ## Description From 8fdd9471201dcecc7cb1eb03ea7990d45798ddad Mon Sep 17 00:00:00 2001 From: sofiathelima Date: Thu, 22 Jan 2026 16:08:13 +0100 Subject: [PATCH 4/9] clarify licensing cleanup and organize --- docs/Tools/Docker.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Tools/Docker.md b/docs/Tools/Docker.md index feb384e1e..0f9588595 100644 --- a/docs/Tools/Docker.md +++ b/docs/Tools/Docker.md @@ -1,6 +1,6 @@ # Docker -Docker **Desktop** is free for educational, personal use, research, and non-commercial use, but check the [Docker Subscription Service Agreement overview](https://www.docker.com/legal/docker-subscription-service-agreement/) in case any of this applies to your intended use. +Docker is a containerization software. ## Licensing (Docker Engine vs Docker Desktop) @@ -9,13 +9,13 @@ The *Docker Engine* (the runtime/daemon `dockerd` and related components) is ope - Docker Engine licensing: https://docs.docker.com/engine/#licensing - Docker Engine upstream license (Moby project): https://github.com/moby/moby/blob/master/LICENSE -Note: Docker Desktop is a separate product with its own subscription/license terms; Docker also notes that the licensing terms for the Docker/Moby open-source projects (such as Docker Engine) aren’t changing: +Note: Docker Desktop is a separate product with its own subscription/license terms; the Docker Desktop is licensed under the [Docker Subscription Service Agreement overview](https://www.docker.com/legal/docker-subscription-service-agreement/). Docker also notes that the licensing terms for the Docker/Moby open-source projects (such as Docker Engine) aren’t changing: - Docker Desktop license agreement note: https://docs.docker.com/subscription/desktop-license/ ## Description -* You cannot use Docker in the cluster. +* You cannot use Docker in the cluster (the engine is not intalled there and requires root privileges). * But you can use Docker to create your custom containers locally. From 6e410a4d5f062e9c4fc1b3db39061343ee5779af Mon Sep 17 00:00:00 2001 From: sofiathelima Date: Thu, 22 Jan 2026 16:12:00 +0100 Subject: [PATCH 5/9] fix linting git action checks --- docs/Tools/Docker.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/Tools/Docker.md b/docs/Tools/Docker.md index 0f9588595..e42b46d2c 100644 --- a/docs/Tools/Docker.md +++ b/docs/Tools/Docker.md @@ -2,17 +2,6 @@ Docker is a containerization software. -## Licensing (Docker Engine vs Docker Desktop) - -The *Docker Engine* (the runtime/daemon `dockerd` and related components) is open source and distributed under the **Apache License 2.0** (a permissive license). Docker explicitly documents this in the Docker Engine manual: - -- Docker Engine licensing: https://docs.docker.com/engine/#licensing -- Docker Engine upstream license (Moby project): https://github.com/moby/moby/blob/master/LICENSE - -Note: Docker Desktop is a separate product with its own subscription/license terms; the Docker Desktop is licensed under the [Docker Subscription Service Agreement overview](https://www.docker.com/legal/docker-subscription-service-agreement/). Docker also notes that the licensing terms for the Docker/Moby open-source projects (such as Docker Engine) aren’t changing: - -- Docker Desktop license agreement note: https://docs.docker.com/subscription/desktop-license/ - ## Description * You cannot use Docker in the cluster (the engine is not intalled there and requires root privileges). @@ -30,6 +19,17 @@ If you need/want to create a new container, you can follow guidelines on how is * If appropriate ask some BBG member with permission to upload it to the lab [docker hub](https://hub.docker.com/u/bbglab). +## Licensing (Docker Engine vs Docker Desktop) + +The *Docker Engine* (the runtime/daemon `dockerd` and related components) is open source and distributed under the **Apache License 2.0** (a permissive license). Docker explicitly documents this in the Docker Engine manual: + +- Docker Engine licensing: https://docs.docker.com/engine/#licensing +- Docker Engine upstream license (Moby project): https://github.com/moby/moby/blob/master/LICENSE + +Note: Docker Desktop is a separate product with its own subscription/license terms; the Docker Desktop is licensed under the [Docker Subscription Service Agreement overview](https://www.docker.com/legal/docker-subscription-service-agreement/). Docker also notes that the licensing terms for the Docker/Moby open-source projects (such as Docker Engine) aren’t changing: + +- Docker Desktop license agreement note: https://docs.docker.com/subscription/desktop-license/ + ## Reference - Ferriol Calvet From 6c5c0f92819e71afdd80518e386e0ee19b5a93d7 Mon Sep 17 00:00:00 2001 From: sofiathelima Date: Thu, 22 Jan 2026 16:16:16 +0100 Subject: [PATCH 6/9] fix linting git action checks --- docs/Tools/Docker.md | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/docs/Tools/Docker.md b/docs/Tools/Docker.md index e42b46d2c..0bbc8a148 100644 --- a/docs/Tools/Docker.md +++ b/docs/Tools/Docker.md @@ -10,26 +10,19 @@ Docker is a containerization software. ## Create Docker containers -Internally we have this GitHub repository with the receipes for many of the custom containers that we are generating and hosting in our dockerhub. +Internally we have this GitHub repository with the receipes for many of the custom containers that we are generating and + hosting in our dockerhub. -If you need/want to create a new container, you can follow guidelines on how is the most appropriate way of doing it, and once you have a working version of it, you must: +If you need/want to create a new container, you can follow guidelines on how is the most appropriate way of doing it, and + once you have a working version of it, you must: -* Add your Dockerfile and associated files required for generating the container to our [GitHub repository of containers](https://github.com/bbglab/containers-recipes). Make sure that your container is fully reproducible. +* Add your Dockerfile and associated files required for generating the container to our + [GitHub repository of containers](https://github.com/bbglab/containers-recipes). Make sure that your container is fully + reproducible. -* If appropriate ask some BBG member with permission to upload it to the lab [docker hub](https://hub.docker.com/u/bbglab). - - -## Licensing (Docker Engine vs Docker Desktop) - -The *Docker Engine* (the runtime/daemon `dockerd` and related components) is open source and distributed under the **Apache License 2.0** (a permissive license). Docker explicitly documents this in the Docker Engine manual: - -- Docker Engine licensing: https://docs.docker.com/engine/#licensing -- Docker Engine upstream license (Moby project): https://github.com/moby/moby/blob/master/LICENSE - -Note: Docker Desktop is a separate product with its own subscription/license terms; the Docker Desktop is licensed under the [Docker Subscription Service Agreement overview](https://www.docker.com/legal/docker-subscription-service-agreement/). Docker also notes that the licensing terms for the Docker/Moby open-source projects (such as Docker Engine) aren’t changing: - -- Docker Desktop license agreement note: https://docs.docker.com/subscription/desktop-license/ +* If appropriate ask some BBG member with permission to upload it to the lab +[docker hub](https://hub.docker.com/u/bbglab). ## Reference -- Ferriol Calvet +* Ferriol Calvet From 8599fa0076c837eecf0abe105425f30187f593d2 Mon Sep 17 00:00:00 2001 From: sofiathelima Date: Thu, 22 Jan 2026 16:18:04 +0100 Subject: [PATCH 7/9] fix linting git action checks --- docs/Tools/Docker.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Tools/Docker.md b/docs/Tools/Docker.md index 0bbc8a148..eaa75ce7f 100644 --- a/docs/Tools/Docker.md +++ b/docs/Tools/Docker.md @@ -13,8 +13,8 @@ Docker is a containerization software. Internally we have this GitHub repository with the receipes for many of the custom containers that we are generating and hosting in our dockerhub. -If you need/want to create a new container, you can follow guidelines on how is the most appropriate way of doing it, and - once you have a working version of it, you must: +If you need/want to create a new container, you can follow guidelines on how is the most appropriate way of doing it, +and once you have a working version of it, you must: * Add your Dockerfile and associated files required for generating the container to our [GitHub repository of containers](https://github.com/bbglab/containers-recipes). Make sure that your container is fully From 224a4e04bd415ffbfaa6bc3748892cdf8eabbaac Mon Sep 17 00:00:00 2001 From: sofiathelima <91429357+sofiathelima@users.noreply.github.com> Date: Thu, 22 Jan 2026 16:21:27 +0100 Subject: [PATCH 8/9] Update docs/Tools/Docker.md spelling Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- docs/Tools/Docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Tools/Docker.md b/docs/Tools/Docker.md index eaa75ce7f..323140f31 100644 --- a/docs/Tools/Docker.md +++ b/docs/Tools/Docker.md @@ -4,7 +4,7 @@ Docker is a containerization software. ## Description -* You cannot use Docker in the cluster (the engine is not intalled there and requires root privileges). +* You cannot use Docker in the cluster (the engine is not installed there and requires root privileges). * But you can use Docker to create your custom containers locally. From aaf475085ac23afb367683903833bc352e3a5fb8 Mon Sep 17 00:00:00 2001 From: sofiathelima Date: Thu, 22 Jan 2026 16:27:08 +0100 Subject: [PATCH 9/9] licensing and linting clarify and cleanup --- docs/Tools/Docker.md | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/docs/Tools/Docker.md b/docs/Tools/Docker.md index 323140f31..a5f61d6b4 100644 --- a/docs/Tools/Docker.md +++ b/docs/Tools/Docker.md @@ -14,14 +14,33 @@ Internally we have this GitHub repository with the receipes for many of the cust hosting in our dockerhub. If you need/want to create a new container, you can follow guidelines on how is the most appropriate way of doing it, -and once you have a working version of it, you must: + and once you have a working version of it, you must: * Add your Dockerfile and associated files required for generating the container to our [GitHub repository of containers](https://github.com/bbglab/containers-recipes). Make sure that your container is fully reproducible. * If appropriate ask some BBG member with permission to upload it to the lab -[docker hub](https://hub.docker.com/u/bbglab). + [docker hub](https://hub.docker.com/u/bbglab). + +## Licensing (Docker Engine vs Docker Desktop) + +The *Docker Engine* (the runtime/daemon `dockerd` and related components) is open source and distributed under the + **Apache License 2.0** (a permissive license). Docker explicitly documents this in the Docker Engine manual: + +* Docker Engine licensing: + [https://docs.docker.com/engine/#licensing](https://docs.docker.com/engine/#licensing) +* Docker Engine upstream license (Moby project): + [https://github.com/moby/moby/blob/master/LICENSE](https://github.com/moby/moby/blob/master/LICENSE) + +Note: Docker Desktop is a separate product with its own subscription/license terms; the Docker Desktop is licensed under + the + [Docker Subscription Service Agreement overview](https://www.docker.com/legal/docker-subscription-service-agreement/). + Docker also notes that the licensing terms for the Docker/Moby open-source projects (such as Docker Engine) aren’t + changing: + +* Docker Desktop license agreement note: + [https://docs.docker.com/subscription/desktop-license/](https://docs.docker.com/subscription/desktop-license/) ## Reference