Merge pull request #1871 from camptocamp/docker-compose-2

Display the version of Docker Compose version 2
camptocamp · Aug 9, 2024 · 08ea2c4 · 08ea2c4
2 parents 5bc3369 + 44fd818
commit 08ea2c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/c2cciutils/configuration.py b/c2cciutils/configuration.py
@@ -464,7 +464,7 @@ class K8SConfiguration(TypedDict, total=False):
     {"name": "npm", "prefix": "npm ", "cmd": ["npm", "--version"]},
     {"name": "make", "cmd": ["make", "--version"], "prefix": "make "},
     {"name": "docker", "cmd": ["docker", "--version"]},
-    {"name": "docker-compose", "cmd": ["docker-compose", "--version"]},
+    {"name": "docker compose", "cmd": ["docker", "compose", "--version"]},
     {"name": "java", "cmd": ["java", "-version"]},
     {"name": "kubectl", "cmd": ["kubectl", "version"]},
     {"name": "helm", "cmd": ["helm", "version"]},
@@ -620,9 +620,10 @@ class PrintVersions(TypedDict, total=False):
         - --version
         name: docker
       - cmd:
-        - docker-compose
+        - docker
+        - compose
         - --version
-        name: docker-compose
+        name: docker compose
       - cmd:
         - java
         - -version

diff --git a/c2cciutils/schema.json b/c2cciutils/schema.json
@@ -459,7 +459,7 @@
             { "name": "npm", "prefix": "npm ", "cmd": ["npm", "--version"] },
             { "name": "make", "cmd": ["make", "--version"], "prefix": "make " },
             { "name": "docker", "cmd": ["docker", "--version"] },
-            { "name": "docker-compose", "cmd": ["docker-compose", "--version"] },
+            { "name": "docker compose", "cmd": ["docker", "compose", "--version"] },
             { "name": "java", "cmd": ["java", "-version"] },
             { "name": "kubectl", "cmd": ["kubectl", "version"] },
             { "name": "helm", "cmd": ["helm", "version"] }

diff --git a/config.md b/config.md
@@ -147,7 +147,7 @@ _C2C CI utils configuration file_
         - **Items** _(string)_
     - : Must be: `false`.
 - <a id="definitions/print_versions"></a>**`print_versions`** _(object)_: The print versions configuration.
-  - **`versions`** _(array)_: Default: `[{"name": "c2cciutils", "cmd": ["c2cciutils", "--version"]}, {"name": "python", "cmd": ["python3", "--version"]}, {"name": "pip", "cmd": ["python3", "-m", "pip", "--version"]}, {"name": "twine", "cmd": ["twine", "--version"]}, {"name": "node", "prefix": "node ", "cmd": ["node", "--version"]}, {"name": "npm", "prefix": "npm ", "cmd": ["npm", "--version"]}, {"name": "make", "cmd": ["make", "--version"], "prefix": "make "}, {"name": "docker", "cmd": ["docker", "--version"]}, {"name": "docker-compose", "cmd": ["docker-compose", "--version"]}, {"name": "java", "cmd": ["java", "-version"]}, {"name": "kubectl", "cmd": ["kubectl", "version"]}, {"name": "helm", "cmd": ["helm", "version"]}]`.
+  - **`versions`** _(array)_: Default: `[{"name": "c2cciutils", "cmd": ["c2cciutils", "--version"]}, {"name": "python", "cmd": ["python3", "--version"]}, {"name": "pip", "cmd": ["python3", "-m", "pip", "--version"]}, {"name": "twine", "cmd": ["twine", "--version"]}, {"name": "node", "prefix": "node ", "cmd": ["node", "--version"]}, {"name": "npm", "prefix": "npm ", "cmd": ["npm", "--version"]}, {"name": "make", "cmd": ["make", "--version"], "prefix": "make "}, {"name": "docker", "cmd": ["docker", "--version"]}, {"name": "docker compose", "cmd": ["docker", "compose", "--version"]}, {"name": "java", "cmd": ["java", "-version"]}, {"name": "kubectl", "cmd": ["kubectl", "version"]}, {"name": "helm", "cmd": ["helm", "version"]}]`.
     - **Items** _(object)_
       - **`cmd`** _(array)_: The command that should be used.
         - **Items** _(string)_