From 331266499c98a2f9c43364c39b329da997108d32 Mon Sep 17 00:00:00 2001
From: Yatharth Sharma <yatharth0045@gmail.com>
Date: Tue, 15 Jul 2025 21:50:37 +0530
Subject: [PATCH] removed version property from docker-compose

---
 .../upgrade/docker/upgrade_preparing.md            | 14 +-------------
 docker/docker-compose.cassandra.volumes.yml        |  2 --
 docker/docker-compose.confluent.yml                |  2 --
 docker/docker-compose.edqs.volumes.yml             |  2 --
 docker/docker-compose.edqs.yml                     |  2 --
 docker/docker-compose.hybrid.yml                   |  2 --
 docker/docker-compose.kafka.yml                    |  2 --
 docker/docker-compose.postgres.volumes.yml         |  2 --
 docker/docker-compose.postgres.yml                 |  2 --
 docker/docker-compose.prometheus-grafana.yml       |  2 --
 docker/docker-compose.valkey-cluster.volumes.yml   |  2 --
 docker/docker-compose.valkey-cluster.yml           |  2 --
 docker/docker-compose.valkey-sentinel.volumes.yml  |  2 --
 docker/docker-compose.valkey-sentinel.yml          |  2 --
 docker/docker-compose.valkey.volumes.yml           |  2 --
 docker/docker-compose.valkey.yml                   |  3 ---
 docker/docker-compose.volumes.yml                  |  2 --
 docker/docker-compose.yml                          |  3 ---
 .../docker-compose.hybrid-test-extras.yml          |  2 --
 .../test/resources/docker-compose.mosquitto.yml    |  1 -
 .../docker-compose.postgres-test-extras.yml        |  2 --
 .../resources/docker-compose.rabbitmq-server.yml   |  2 --
 .../docker-compose.valkey-ssl.volumes.yml          |  2 --
 .../test/resources/docker-compose.valkey-ssl.yml   |  2 --
 24 files changed, 1 insertion(+), 60 deletions(-)

diff --git a/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md b/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md
index a0536f113a..f12eaa5fc0 100644
--- a/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md
+++ b/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md
@@ -32,19 +32,7 @@ docker run --rm -v tb-edge-postgres-data:/volume -v ~/.mytb-edge-data/db:/backup
 After completing the data migration to the newly created Docker volumes, you'll need to update the volume mounts in your Docker Compose configuration.
 Modify the `docker-compose.yml` file for ThingsBoard Edge to update the volume settings.
 
-First, please update docker compose file version. Find next snippet:
-```text
-version: '3.0'
-...
-```
-
-And replace it with:
-```text
-version: '3.8'
-...
-```
-
-Then update volume mounts. Locate the following snippet:
+Update volume mounts. Locate the following snippet:
 ```text
     volumes:
       - ~/.mytb-edge-data:/data
diff --git a/docker/docker-compose.cassandra.volumes.yml b/docker/docker-compose.cassandra.volumes.yml
index c6d64c484e..8e92069a06 100644
--- a/docker/docker-compose.cassandra.volumes.yml
+++ b/docker/docker-compose.cassandra.volumes.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   cassandra:
     volumes:
diff --git a/docker/docker-compose.confluent.yml b/docker/docker-compose.confluent.yml
index e832b72519..46cb0235ee 100644
--- a/docker/docker-compose.confluent.yml
+++ b/docker/docker-compose.confluent.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   tb-js-executor:
     env_file:
diff --git a/docker/docker-compose.edqs.volumes.yml b/docker/docker-compose.edqs.volumes.yml
index 3a45542b99..cebc7dd290 100644
--- a/docker/docker-compose.edqs.volumes.yml
+++ b/docker/docker-compose.edqs.volumes.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   tb-edqs1:
     volumes:
diff --git a/docker/docker-compose.edqs.yml b/docker/docker-compose.edqs.yml
index 21bace143a..3ebb526a2d 100644
--- a/docker/docker-compose.edqs.yml
+++ b/docker/docker-compose.edqs.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   tb-core1:
     env_file:
diff --git a/docker/docker-compose.hybrid.yml b/docker/docker-compose.hybrid.yml
index 3ced5385f1..6b4129ec56 100644
--- a/docker/docker-compose.hybrid.yml
+++ b/docker/docker-compose.hybrid.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   postgres:
     restart: always
diff --git a/docker/docker-compose.kafka.yml b/docker/docker-compose.kafka.yml
index 7e6fcae09c..026070cc89 100644
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   kafka:
     restart: always
diff --git a/docker/docker-compose.postgres.volumes.yml b/docker/docker-compose.postgres.volumes.yml
index 3d2e026ef4..696189a639 100644
--- a/docker/docker-compose.postgres.volumes.yml
+++ b/docker/docker-compose.postgres.volumes.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   postgres:
     volumes:
diff --git a/docker/docker-compose.postgres.yml b/docker/docker-compose.postgres.yml
index cd0373af42..bf43e1823d 100644
--- a/docker/docker-compose.postgres.yml
+++ b/docker/docker-compose.postgres.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   postgres:
     restart: always
diff --git a/docker/docker-compose.prometheus-grafana.yml b/docker/docker-compose.prometheus-grafana.yml
index 81650c6b26..38699f1040 100644
--- a/docker/docker-compose.prometheus-grafana.yml
+++ b/docker/docker-compose.prometheus-grafana.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 volumes:
     prometheus_data: {}
     grafana_data: {}
diff --git a/docker/docker-compose.valkey-cluster.volumes.yml b/docker/docker-compose.valkey-cluster.volumes.yml
index 7e78d04505..e8da9844d9 100644
--- a/docker/docker-compose.valkey-cluster.volumes.yml
+++ b/docker/docker-compose.valkey-cluster.volumes.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   # Valkey cluster
   valkey-node-0:
diff --git a/docker/docker-compose.valkey-cluster.yml b/docker/docker-compose.valkey-cluster.yml
index 02757240dc..242fabf44b 100644
--- a/docker/docker-compose.valkey-cluster.yml
+++ b/docker/docker-compose.valkey-cluster.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
 # Valkey cluster
 # The latest version of Valkey compatible with ThingsBoard is 8.0
diff --git a/docker/docker-compose.valkey-sentinel.volumes.yml b/docker/docker-compose.valkey-sentinel.volumes.yml
index 0f53ee005d..3f4a09a912 100644
--- a/docker/docker-compose.valkey-sentinel.volumes.yml
+++ b/docker/docker-compose.valkey-sentinel.volumes.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   # Valkey sentinel
   valkey-primary:
diff --git a/docker/docker-compose.valkey-sentinel.yml b/docker/docker-compose.valkey-sentinel.yml
index d4b791643a..3827e0358b 100644
--- a/docker/docker-compose.valkey-sentinel.yml
+++ b/docker/docker-compose.valkey-sentinel.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   # Valkey sentinel
   # The latest version of Valkey compatible with ThingsBoard is 8.0
diff --git a/docker/docker-compose.valkey.volumes.yml b/docker/docker-compose.valkey.volumes.yml
index 7da5f154a6..02a7c397a3 100644
--- a/docker/docker-compose.valkey.volumes.yml
+++ b/docker/docker-compose.valkey.volumes.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   valkey:
     volumes:
diff --git a/docker/docker-compose.valkey.yml b/docker/docker-compose.valkey.yml
index 6b8cf3feb3..250ccec9d0 100644
--- a/docker/docker-compose.valkey.yml
+++ b/docker/docker-compose.valkey.yml
@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-version: '3.0'
-
 services:
 # Valkey standalone
 # The latest version of Valkey compatible with ThingsBoard is 8.0
diff --git a/docker/docker-compose.volumes.yml b/docker/docker-compose.volumes.yml
index 06a904e7fc..a01247c25d 100644
--- a/docker/docker-compose.volumes.yml
+++ b/docker/docker-compose.volumes.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   tb-core1:
     volumes:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1cee5ad5ad..224f94c103 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -14,9 +14,6 @@
 # limitations under the License.
 #
 
-
-version: '3.0'
-
 services:
   zookeeper:
     restart: always
diff --git a/msa/black-box-tests/src/test/resources/docker-compose.hybrid-test-extras.yml b/msa/black-box-tests/src/test/resources/docker-compose.hybrid-test-extras.yml
index 0d527e9eb5..c213a2cb57 100644
--- a/msa/black-box-tests/src/test/resources/docker-compose.hybrid-test-extras.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.hybrid-test-extras.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   cassandra:
     environment:
diff --git a/msa/black-box-tests/src/test/resources/docker-compose.mosquitto.yml b/msa/black-box-tests/src/test/resources/docker-compose.mosquitto.yml
index ccc3f34599..cd09476924 100644
--- a/msa/black-box-tests/src/test/resources/docker-compose.mosquitto.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.mosquitto.yml
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
 services:
   broker:
     image: eclipse-mosquitto
diff --git a/msa/black-box-tests/src/test/resources/docker-compose.postgres-test-extras.yml b/msa/black-box-tests/src/test/resources/docker-compose.postgres-test-extras.yml
index f88f3543fb..42b3f144a2 100644
--- a/msa/black-box-tests/src/test/resources/docker-compose.postgres-test-extras.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.postgres-test-extras.yml
@@ -14,6 +14,4 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 # Placeholder
diff --git a/msa/black-box-tests/src/test/resources/docker-compose.rabbitmq-server.yml b/msa/black-box-tests/src/test/resources/docker-compose.rabbitmq-server.yml
index 309bb6c0fa..0c89d2d6e7 100644
--- a/msa/black-box-tests/src/test/resources/docker-compose.rabbitmq-server.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.rabbitmq-server.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   rabbitmq:
     restart: always
diff --git a/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.volumes.yml b/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.volumes.yml
index 7da5f154a6..02a7c397a3 100644
--- a/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.volumes.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.volumes.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
   valkey:
     volumes:
diff --git a/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml b/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml
index 73de64b303..8c3029cda1 100644
--- a/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-version: '3.0'
-
 services:
 # Valkey standalone
 # The latest version of Valkey compatible with ThingsBoard is 8.0