diff --git a/check_eol-data/systemtools.cfg b/check_eol-data/systemtools.cfg
index 75a4a942fd961eaa343b9c15179599f2cd751b9a..fd72a6e9e22f2f9b608f146feaaa3e74c3c0160b 100644
--- a/check_eol-data/systemtools.cfg
+++ b/check_eol-data/systemtools.cfg
@@ -24,3 +24,17 @@ ceph:17.2:2024-06-01
 ceph:18.2:2025-08-01
 ceph:19.2:2026-09-19
 
+
+# ----------------------------------------------------------------------
+# https://docs.docker.com/engine/release-notes
+docker:Docker is an open platform for developing, shipping, and running applications.
+docker:website https://www.docker.com
+# ......................................................................
+
+docker:28:2028-01-01:(not defined yet - check https://github.com/moby/moby/blob/master/project/BRANCHES-AND-TAGS.md)
+docker:27:2025-12-01:(not defined yet - check https://github.com/moby/moby/blob/master/project/BRANCHES-AND-TAGS.md)
+docker:26:2023-01-01
+docker:25:2026-10-01:(not defined yet - check https://github.com/moby/moby/blob/master/project/BRANCHES-AND-TAGS.md)
+docker:24:2023-01-01
+docker:23:2025-05-19
+
diff --git a/check_eol-versiondetect/detect-docker b/check_eol-versiondetect/detect-docker
new file mode 100755
index 0000000000000000000000000000000000000000..5dc946656e7f438d9ab63c04f1336dc714f668e8
--- /dev/null
+++ b/check_eol-versiondetect/detect-docker
@@ -0,0 +1,15 @@
+# ----------------------------------------------------------------------------
+# 
+# EOL - End of life detection - Warn before reaching end of life
+#
+# detect version of Docker-Client
+#
+# ----------------------------------------------------------------------------
+# 2025-02-25  v1.0  <martin.gasser@unibe.ch>
+# ----------------------------------------------------------------------------
+
+# ----- example output
+#   docker version --format '{{.Client.Version}}' 
+#   27.5.1
+
+docker version --format '{{.Client.Version}}' 2>&1 | cut -f 1 -d "."  | head -n 1