From 7a395953727b0570a18713e154facb9807cd76f8 Mon Sep 17 00:00:00 2001 From: Jimmy Weng Date: Sun, 4 May 2025 16:54:27 +0800 Subject: [PATCH 1/5] HDDS-12964. Add Docker Compose v2.32.1+ requirement to documentation --- hadoop-hdds/docs/content/start/FromSource.md | 1 + 1 file changed, 1 insertion(+) diff --git a/hadoop-hdds/docs/content/start/FromSource.md b/hadoop-hdds/docs/content/start/FromSource.md index 9d3947ad1cd4..a169e1b6cd45 100644 --- a/hadoop-hdds/docs/content/start/FromSource.md +++ b/hadoop-hdds/docs/content/start/FromSource.md @@ -25,6 +25,7 @@ weight: 30 * JDK 1.8 or higher * [Maven 3.6 or later](https://maven.apache.org/download.cgi) * Internet connection for first build (to fetch all Maven and Ozone dependencies) +* [Docker Compose v2.32.1 or higher](https://docs.docker.com/compose/install/) (to prevent unexpected character “-” in variable name issue) You will also need to install the following dependencies to build native code (optional): * gcc From 74d50292baba427f4c59047d48b2a58d85fceffa Mon Sep 17 00:00:00 2001 From: Jimmy Weng Date: Wed, 7 May 2025 09:30:02 +0800 Subject: [PATCH 2/5] HDDS-12964. Update Docker Compose requirement description --- hadoop-hdds/docs/content/start/FromSource.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-hdds/docs/content/start/FromSource.md b/hadoop-hdds/docs/content/start/FromSource.md index a169e1b6cd45..b3bad9a4a16d 100644 --- a/hadoop-hdds/docs/content/start/FromSource.md +++ b/hadoop-hdds/docs/content/start/FromSource.md @@ -25,7 +25,7 @@ weight: 30 * JDK 1.8 or higher * [Maven 3.6 or later](https://maven.apache.org/download.cgi) * Internet connection for first build (to fetch all Maven and Ozone dependencies) -* [Docker Compose v2.32.1 or higher](https://docs.docker.com/compose/install/) (to prevent unexpected character “-” in variable name issue) +* [Docker Compose v2.30 or newer](https://docs.docker.com/compose/install/) You will also need to install the following dependencies to build native code (optional): * gcc From ee03dbc23d139e6de2115000e91385587aaec5bf Mon Sep 17 00:00:00 2001 From: Jimmy Weng Date: Fri, 9 May 2025 22:19:18 +0800 Subject: [PATCH 3/5] Revert "HDDS-12964. Update Docker Compose requirement description" This reverts commit 74d50292baba427f4c59047d48b2a58d85fceffa. --- hadoop-hdds/docs/content/start/FromSource.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-hdds/docs/content/start/FromSource.md b/hadoop-hdds/docs/content/start/FromSource.md index b3bad9a4a16d..a169e1b6cd45 100644 --- a/hadoop-hdds/docs/content/start/FromSource.md +++ b/hadoop-hdds/docs/content/start/FromSource.md @@ -25,7 +25,7 @@ weight: 30 * JDK 1.8 or higher * [Maven 3.6 or later](https://maven.apache.org/download.cgi) * Internet connection for first build (to fetch all Maven and Ozone dependencies) -* [Docker Compose v2.30 or newer](https://docs.docker.com/compose/install/) +* [Docker Compose v2.32.1 or higher](https://docs.docker.com/compose/install/) (to prevent unexpected character “-” in variable name issue) You will also need to install the following dependencies to build native code (optional): * gcc From 4d2dbb5425eccaad44ef35de440578bc0d2f987f Mon Sep 17 00:00:00 2001 From: Jimmy Weng Date: Fri, 9 May 2025 22:19:18 +0800 Subject: [PATCH 4/5] Revert "HDDS-12964. Add Docker Compose v2.32.1+ requirement to documentation" This reverts commit 7a395953727b0570a18713e154facb9807cd76f8. --- hadoop-hdds/docs/content/start/FromSource.md | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-hdds/docs/content/start/FromSource.md b/hadoop-hdds/docs/content/start/FromSource.md index a169e1b6cd45..9d3947ad1cd4 100644 --- a/hadoop-hdds/docs/content/start/FromSource.md +++ b/hadoop-hdds/docs/content/start/FromSource.md @@ -25,7 +25,6 @@ weight: 30 * JDK 1.8 or higher * [Maven 3.6 or later](https://maven.apache.org/download.cgi) * Internet connection for first build (to fetch all Maven and Ozone dependencies) -* [Docker Compose v2.32.1 or higher](https://docs.docker.com/compose/install/) (to prevent unexpected character “-” in variable name issue) You will also need to install the following dependencies to build native code (optional): * gcc From 5857ded10408b8d4d61926b6b655e82739bbe7d5 Mon Sep 17 00:00:00 2001 From: Jimmy Weng Date: Fri, 9 May 2025 22:32:50 +0800 Subject: [PATCH 5/5] HDDS-12964. Add Docker required version --- hadoop-hdds/docs/content/start/RunningViaDocker.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-hdds/docs/content/start/RunningViaDocker.md b/hadoop-hdds/docs/content/start/RunningViaDocker.md index db4b696324f3..4103a6e5f671 100644 --- a/hadoop-hdds/docs/content/start/RunningViaDocker.md +++ b/hadoop-hdds/docs/content/start/RunningViaDocker.md @@ -21,7 +21,8 @@ weight: 23 --> {{< requirements >}} - * docker and docker-compose + * [Docker Engine](https://docs.docker.com/engine/install/) latest stable version + * [Docker Compose](https://docs.docker.com/compose/install/) at least v2.30 {{< /requirements >}} * Download the Ozone binary tarball and untar it.