From 61f16ee23b1c5ab2376b79490da0f3b4625ccbdf Mon Sep 17 00:00:00 2001
From: Ilia Kurenkov <ilia.kurenkov@datadoghq.com>
Date: Wed, 27 Nov 2024 14:37:45 +0100
Subject: [PATCH] Remove 'version' field from docker-compose.yaml (#19147)

---
 aerospike/tests/docker/docker-compose.yaml                    | 2 --
 arangodb/tests/docker/docker-compose.yaml                     | 2 --
 boundary/tests/docker/docker-compose.yaml                     | 2 --
 clickhouse/tests/docker/docker-compose.yaml                   | 2 --
 cockroachdb/tests/docker/docker-compose.yaml                  | 2 --
 coredns/tests/docker/docker-compose.yml                       | 2 --
 envoy/tests/docker/api_v2/docker-compose.yaml                 | 2 --
 envoy/tests/docker/api_v3/docker-compose.yaml                 | 2 --
 etcd/tests/docker/docker-compose.yaml                         | 2 --
 foundationdb/tests/docker/docker-compose.yaml                 | 1 -
 hudi/tests/docker/docker-compose.yaml                         | 2 --
 ibm_ace/tests/docker/docker-compose.yaml                      | 2 --
 ibm_db2/tests/docker/docker-compose.yaml                      | 2 --
 ibm_was/tests/docker/docker-compose.yaml                      | 2 --
 jboss_wildfly/tests/docker/docker-compose.yml                 | 1 -
 lighttpd/tests/docker/auth/docker-compose.yaml                | 2 --
 lighttpd/tests/docker/noauth/docker-compose.yaml              | 4 +---
 nginx/tests/docker/docker-compose.yaml                        | 2 --
 presto/tests/docker/docker-compose.yaml                       | 2 --
 prometheus/tests/docker/docker-compose.yaml                   | 2 --
 pulsar/tests/docker/docker-compose.yaml                       | 2 --
 ray/tests/docker/docker-compose.yaml                          | 2 --
 sap_hana/tests/docker/docker-compose.yaml                     | 2 --
 solr/tests/docker/docker-compose.yml                          | 1 -
 sonarqube/tests/docker/docker-compose.yaml                    | 2 --
 spark/tests/docker/docker-compose.yaml                        | 4 +---
 sqlserver/tests/compose-ha/docker-compose.yaml                | 1 -
 .../compose-high-cardinality-windows/docker-compose.yaml      | 4 +---
 sqlserver/tests/compose-high-cardinality/docker-compose.yaml  | 2 --
 sqlserver/tests/compose-windows/docker-compose.yaml           | 4 +---
 teamcity/tests/docker/teamcity_server/docker-compose.yaml     | 1 -
 torchserve/tests/docker/docker-compose.yaml                   | 2 --
 vault/tests/docker/docker-compose.yaml                        | 2 --
 vllm/tests/docker/docker-compose.yaml                         | 3 +--
 34 files changed, 5 insertions(+), 67 deletions(-)

diff --git a/aerospike/tests/docker/docker-compose.yaml b/aerospike/tests/docker/docker-compose.yaml
index e255b1c63110a..e7bbbef761193 100644
--- a/aerospike/tests/docker/docker-compose.yaml
+++ b/aerospike/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   aerospike:
     container_name: aerospike
diff --git a/arangodb/tests/docker/docker-compose.yaml b/arangodb/tests/docker/docker-compose.yaml
index 539aaa1b14c47..ddac16dd6cd2a 100644
--- a/arangodb/tests/docker/docker-compose.yaml
+++ b/arangodb/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   arangodb:
     container_name: arangodb
diff --git a/boundary/tests/docker/docker-compose.yaml b/boundary/tests/docker/docker-compose.yaml
index ec2c79ff9886b..21d330af9a446 100644
--- a/boundary/tests/docker/docker-compose.yaml
+++ b/boundary/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 # https://github.com/hashicorp/boundary-reference-architecture/tree/main/deployment/docker/compose
 services:
   boundary:
diff --git a/clickhouse/tests/docker/docker-compose.yaml b/clickhouse/tests/docker/docker-compose.yaml
index 1765a2529f217..23e52199237df 100644
--- a/clickhouse/tests/docker/docker-compose.yaml
+++ b/clickhouse/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.9'
-
 # https://clickhouse.yandex/docs/en/operations/table_engines/distributed/
 # https://clickhouse.yandex/docs/en/operations/table_engines/replication/#creating-replicated-tables
 services:
diff --git a/cockroachdb/tests/docker/docker-compose.yaml b/cockroachdb/tests/docker/docker-compose.yaml
index 5b111a152fd20..a1621defb7db6 100644
--- a/cockroachdb/tests/docker/docker-compose.yaml
+++ b/cockroachdb/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   cockroachdb:
     container_name: cockroachdb
diff --git a/coredns/tests/docker/docker-compose.yml b/coredns/tests/docker/docker-compose.yml
index dc139fe854039..165552d7c622d 100644
--- a/coredns/tests/docker/docker-compose.yml
+++ b/coredns/tests/docker/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.2"
-
 services:
   coredns:
     image: coredns/coredns:${COREDNS_VERSION}
diff --git a/envoy/tests/docker/api_v2/docker-compose.yaml b/envoy/tests/docker/api_v2/docker-compose.yaml
index b0823bb60acb5..1b07da7965e46 100644
--- a/envoy/tests/docker/api_v2/docker-compose.yaml
+++ b/envoy/tests/docker/api_v2/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
 
   front-envoy:
diff --git a/envoy/tests/docker/api_v3/docker-compose.yaml b/envoy/tests/docker/api_v3/docker-compose.yaml
index c46684c96b5ff..cfa48e601108e 100644
--- a/envoy/tests/docker/api_v3/docker-compose.yaml
+++ b/envoy/tests/docker/api_v3/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
 
   front-envoy:
diff --git a/etcd/tests/docker/docker-compose.yaml b/etcd/tests/docker/docker-compose.yaml
index ad9da29a23358..69375017f28ba 100644
--- a/etcd/tests/docker/docker-compose.yaml
+++ b/etcd/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 # Adapted from https://github.com/dwilbraham/docker-compose-etcd
 services:
   etcd0:
diff --git a/foundationdb/tests/docker/docker-compose.yaml b/foundationdb/tests/docker/docker-compose.yaml
index f6cfdc65f435f..3f2b1c6460ad7 100644
--- a/foundationdb/tests/docker/docker-compose.yaml
+++ b/foundationdb/tests/docker/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   fdb-coordinator:
     image: foundationdb/foundationdb:6.3.13
diff --git a/hudi/tests/docker/docker-compose.yaml b/hudi/tests/docker/docker-compose.yaml
index 235a2b441c8f2..06dc9e17c2c3f 100644
--- a/hudi/tests/docker/docker-compose.yaml
+++ b/hudi/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 # Adapted from https://github.com/big-data-europe/docker-spark/tree/master/template
 services:
   spark-app-hudi:
diff --git a/ibm_ace/tests/docker/docker-compose.yaml b/ibm_ace/tests/docker/docker-compose.yaml
index 3bf3acc951a8b..3ad304ff84fdc 100644
--- a/ibm_ace/tests/docker/docker-compose.yaml
+++ b/ibm_ace/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 # https://github.com/ot4i/ace-docker
 services:
   ibm-ace:
diff --git a/ibm_db2/tests/docker/docker-compose.yaml b/ibm_db2/tests/docker/docker-compose.yaml
index f46e2be7aaf53..6c377329e622a 100644
--- a/ibm_db2/tests/docker/docker-compose.yaml
+++ b/ibm_db2/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
 
   ibm_db2:
diff --git a/ibm_was/tests/docker/docker-compose.yaml b/ibm_was/tests/docker/docker-compose.yaml
index cf38aea05438f..612fd311acb29 100644
--- a/ibm_was/tests/docker/docker-compose.yaml
+++ b/ibm_was/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   ibm_was:
     container_name: ibm_was
diff --git a/jboss_wildfly/tests/docker/docker-compose.yml b/jboss_wildfly/tests/docker/docker-compose.yml
index 4e806f9bd0118..382b6aa12b83b 100644
--- a/jboss_wildfly/tests/docker/docker-compose.yml
+++ b/jboss_wildfly/tests/docker/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   jboss_wildfly:
     image: jboss/wildfly:16.0.0.Final
diff --git a/lighttpd/tests/docker/auth/docker-compose.yaml b/lighttpd/tests/docker/auth/docker-compose.yaml
index dd252739371b7..925e39c935217 100644
--- a/lighttpd/tests/docker/auth/docker-compose.yaml
+++ b/lighttpd/tests/docker/auth/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   lighttpd:
     image: ${LIGHTTPD_IMAGE}
diff --git a/lighttpd/tests/docker/noauth/docker-compose.yaml b/lighttpd/tests/docker/noauth/docker-compose.yaml
index 9cfc5ab3db2da..c6f491db44207 100644
--- a/lighttpd/tests/docker/noauth/docker-compose.yaml
+++ b/lighttpd/tests/docker/noauth/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   lighttpd:
     image: ${LIGHTTPD_IMAGE}
@@ -8,4 +6,4 @@ services:
     volumes:
       - ./lighttpd.conf:/etc/lighttpd/lighttpd.conf
       - ${DD_LOG_1}:/var/log/lighttpd/access.log
-      - ${DD_LOG_2}:/var/log/lighttpd/error.log
\ No newline at end of file
+      - ${DD_LOG_2}:/var/log/lighttpd/error.log
diff --git a/nginx/tests/docker/docker-compose.yaml b/nginx/tests/docker/docker-compose.yaml
index 115f96399c8c8..6c7b2ecc34dc3 100644
--- a/nginx/tests/docker/docker-compose.yaml
+++ b/nginx/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   nginx:
     image: ${NGINX_IMAGE}
diff --git a/presto/tests/docker/docker-compose.yaml b/presto/tests/docker/docker-compose.yaml
index 646051a306922..acc67216ad1e2 100644
--- a/presto/tests/docker/docker-compose.yaml
+++ b/presto/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 # Adapted from https://github.com/Lewuathe/docker-presto-cluster
 services:
   coordinator:
diff --git a/prometheus/tests/docker/docker-compose.yaml b/prometheus/tests/docker/docker-compose.yaml
index cef7c7959835a..ac2352af67a69 100644
--- a/prometheus/tests/docker/docker-compose.yaml
+++ b/prometheus/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   prometheus:
     image: prom/prometheus
diff --git a/pulsar/tests/docker/docker-compose.yaml b/pulsar/tests/docker/docker-compose.yaml
index 312230805e63f..a4c1cef62d028 100644
--- a/pulsar/tests/docker/docker-compose.yaml
+++ b/pulsar/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 # https://pulsar.apache.org/docs/en/next/standalone-docker/
 services:
   pulsar:
diff --git a/ray/tests/docker/docker-compose.yaml b/ray/tests/docker/docker-compose.yaml
index 69075a2295464..1720f3226b96b 100644
--- a/ray/tests/docker/docker-compose.yaml
+++ b/ray/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   ray-head:
     container_name: ray-head
diff --git a/sap_hana/tests/docker/docker-compose.yaml b/sap_hana/tests/docker/docker-compose.yaml
index bd5b3783e4b02..5a3b7f4cf8fa9 100644
--- a/sap_hana/tests/docker/docker-compose.yaml
+++ b/sap_hana/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   sap-hana:
     container_name: sap-hana
diff --git a/solr/tests/docker/docker-compose.yml b/solr/tests/docker/docker-compose.yml
index 2e6707f467daa..6847945b5faae 100644
--- a/solr/tests/docker/docker-compose.yml
+++ b/solr/tests/docker/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   solr:
     build:
diff --git a/sonarqube/tests/docker/docker-compose.yaml b/sonarqube/tests/docker/docker-compose.yaml
index b99a66e7d4e16..f608b1847be5a 100644
--- a/sonarqube/tests/docker/docker-compose.yaml
+++ b/sonarqube/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   sonarqube:
     container_name: sonarqube
diff --git a/spark/tests/docker/docker-compose.yaml b/spark/tests/docker/docker-compose.yaml
index c3a5a4ae4af9b..ec26dbbbbc6b8 100644
--- a/spark/tests/docker/docker-compose.yaml
+++ b/spark/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 # Adapted from https://github.com/big-data-europe/docker-spark/tree/master/template
 services:
   spark-master:
@@ -65,4 +63,4 @@ services:
     ports:
       - "9999:9999"
     environment:
-      - PYTHONUNBUFFERED=1
\ No newline at end of file
+      - PYTHONUNBUFFERED=1
diff --git a/sqlserver/tests/compose-ha/docker-compose.yaml b/sqlserver/tests/compose-ha/docker-compose.yaml
index 3a992415e4569..6bd049c387500 100644
--- a/sqlserver/tests/compose-ha/docker-compose.yaml
+++ b/sqlserver/tests/compose-ha/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: "3"
 services:
     sqlserver:
         build:
diff --git a/sqlserver/tests/compose-high-cardinality-windows/docker-compose.yaml b/sqlserver/tests/compose-high-cardinality-windows/docker-compose.yaml
index 948c3116948ec..155f06e359463 100644
--- a/sqlserver/tests/compose-high-cardinality-windows/docker-compose.yaml
+++ b/sqlserver/tests/compose-high-cardinality-windows/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   sqlserver:
     build:
@@ -8,4 +6,4 @@ services:
       args:
         - SQLSERVER_BASE_IMAGE=${SQLSERVER_BASE_IMAGE}
     ports:
-      - "1433:1433"
\ No newline at end of file
+      - "1433:1433"
diff --git a/sqlserver/tests/compose-high-cardinality/docker-compose.yaml b/sqlserver/tests/compose-high-cardinality/docker-compose.yaml
index 0c9690a6512d7..a7615708c2c16 100644
--- a/sqlserver/tests/compose-high-cardinality/docker-compose.yaml
+++ b/sqlserver/tests/compose-high-cardinality/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   sqlserver:
     build:
diff --git a/sqlserver/tests/compose-windows/docker-compose.yaml b/sqlserver/tests/compose-windows/docker-compose.yaml
index 948c3116948ec..155f06e359463 100644
--- a/sqlserver/tests/compose-windows/docker-compose.yaml
+++ b/sqlserver/tests/compose-windows/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   sqlserver:
     build:
@@ -8,4 +6,4 @@ services:
       args:
         - SQLSERVER_BASE_IMAGE=${SQLSERVER_BASE_IMAGE}
     ports:
-      - "1433:1433"
\ No newline at end of file
+      - "1433:1433"
diff --git a/teamcity/tests/docker/teamcity_server/docker-compose.yaml b/teamcity/tests/docker/teamcity_server/docker-compose.yaml
index 2edcb253a98ba..2e9dc5b6929f8 100644
--- a/teamcity/tests/docker/teamcity_server/docker-compose.yaml
+++ b/teamcity/tests/docker/teamcity_server/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 # Adapted from https://github.com/JetBrains/teamcity-docker-samples
 services:
   teamcity-server:
diff --git a/torchserve/tests/docker/docker-compose.yaml b/torchserve/tests/docker/docker-compose.yaml
index 5b34f237a8a88..d2d92aaec4508 100644
--- a/torchserve/tests/docker/docker-compose.yaml
+++ b/torchserve/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   torchserve:
     container_name: torchserve
diff --git a/vault/tests/docker/docker-compose.yaml b/vault/tests/docker/docker-compose.yaml
index 0dc515a09a93b..12328c6b93c9e 100644
--- a/vault/tests/docker/docker-compose.yaml
+++ b/vault/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   vault-leader:
     container_name: vault-leader
diff --git a/vllm/tests/docker/docker-compose.yaml b/vllm/tests/docker/docker-compose.yaml
index 7a41d2c97a358..251148cf66d2c 100644
--- a/vllm/tests/docker/docker-compose.yaml
+++ b/vllm/tests/docker/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: "3.9"
 services:
   caddy:
     image: caddy:2.7
@@ -8,4 +7,4 @@ services:
     volumes:
       - ./Caddyfile:/etc/caddy/Caddyfile
       - ../fixtures/vllm_metrics.txt:/usr/share/caddy/metrics
-      - ../fixtures/vllm_version.json:/usr/share/caddy/version
\ No newline at end of file
+      - ../fixtures/vllm_version.json:/usr/share/caddy/version