Sy/remove outdated compose version (#17928)

* remove obsolte version * new lines removal * new lines removal * clean up * missing files
DataDog · Jun 26, 2024 · bbeb302 · bbeb302
1 parent 0e18dc9
commit bbeb302
Show file tree

Hide file tree

Showing 120 changed files with 2 additions and 223 deletions.
diff --git a/activemq/tests/compose/activemq.yaml b/activemq/tests/compose/activemq.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   namenode:
     image: rmohr/activemq:${VERSION}
@@ -14,4 +12,3 @@ services:
     ports:
       - "8161:8161"
       - "${JMX_PORT}:${JMX_PORT}"
-
diff --git a/activemq/tests/compose/artemis.yaml b/activemq/tests/compose/artemis.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   namenode:
     image: vromero/activemq-artemis:${VERSION}

diff --git a/activemq_xml/tests/compose/docker-compose.yaml b/activemq_xml/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   activemq_xml:
     image: rmohr/activemq:${ACTIVEMQ_XML_VERSION}

diff --git a/airflow/tests/compose/docker-compose.yaml b/airflow/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   postgres:
     image: postgres:12-alpine

diff --git a/amazon_msk/tests/docker/docker-compose.yaml b/amazon_msk/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mock-msk-endpoint-jmx:
     image: caddy:2.1.1-alpine

diff --git a/apache/tests/compose/apache.yaml b/apache/tests/compose/apache.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   apache:
     image: "httpd:${APACHE_VERSION}"

diff --git a/avi_vantage/tests/compose/docker-compose.yaml b/avi_vantage/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   avi:
     build: .

diff --git a/azure_iot_edge/tests/compose/docker-compose-tls.yaml b/azure_iot_edge/tests/compose/docker-compose-tls.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   iot-edge-device:
     build:

diff --git a/azure_iot_edge/tests/compose/docker-compose.yaml b/azure_iot_edge/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   iot-edge-device:
     build:

diff --git a/azure_iot_edge/tests/compose/mock_server/docker-compose.yaml b/azure_iot_edge/tests/compose/mock_server/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   iot-edge-mock:
     image: caddy:2.1.1-alpine

diff --git a/cacti/tests/compose/docker-compose.yaml b/cacti/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   cacti:
     container_name: cacti

diff --git a/cassandra/tests/compose/docker-compose.yml b/cassandra/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   cassandra:
     build:

diff --git a/cassandra_nodetool/tests/compose/docker-compose.yaml b/cassandra_nodetool/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   dd-test-cassandra:
     build:

diff --git a/ceph/tests/compose/docker-compose.yaml b/ceph/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   dd-test-ceph:
     image: ceph/daemon:${CEPH_VERSION}

diff --git a/citrix_hypervisor/tests/compose/docker-compose.yaml b/citrix_hypervisor/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mock-standalone:
     build: .

diff --git a/cloudera/tests/docker/docker-compose.yaml b/cloudera/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   cloudera:
     image: caddy:2.6.2-alpine

diff --git a/confluent_platform/tests/compose/docker-compose.yaml b/confluent_platform/tests/compose/docker-compose.yaml
@@ -1,6 +1,5 @@
 ---
 # Inspired by https://github.com/confluentinc/cp-all-in-one/blob/6.2.1-post/cp-all-in-one/docker-compose.yml
-version: '2'
 services:
   zookeeper:
     image: confluentinc/cp-zookeeper:${CONFLUENT_VERSION}

diff --git a/consul/tests/compose/compose.yaml b/consul/tests/compose/compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   consul-leader:
     image: "consul:${CONSUL_VERSION}"

diff --git a/couch/tests/compose/compose_v1.yaml b/couch/tests/compose/compose_v1.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   couch:
     container_name: couchdb-1

diff --git a/couch/tests/compose/compose_v2.yaml b/couch/tests/compose/compose_v2.yaml
@@ -1,8 +1,5 @@
-version: "3.5"
-
 networks:
   network:
-
 services:
   couchdb-1:
     container_name: couchdb-1

diff --git a/couchbase/tests/compose/docker-compose.yaml b/couchbase/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   couchbase-standalone:
     image: "couchbase/server:${COUCHBASE_VERSION}"

diff --git a/datadog_checks_base/tests/compose/kerberos/kerberos-agent.yaml b/datadog_checks_base/tests/compose/kerberos/kerberos-agent.yaml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
 
   agent:

diff --git a/datadog_checks_base/tests/compose/kerberos/kerberos.yaml b/datadog_checks_base/tests/compose/kerberos/kerberos.yaml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   kerberos-kdc:
     build: ./kerberos-kdc

diff --git a/datadog_checks_base/tests/compose/socks5-proxy.yaml b/datadog_checks_base/tests/compose/socks5-proxy.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   socks5:
     image: "serjs/go-socks5-proxy:latest"

diff --git a/datadog_checks_base/tests/compose/uds/uds.yaml b/datadog_checks_base/tests/compose/uds/uds.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   uds-server:
     image: nginx:1.19-alpine

diff --git a/dcgm/tests/docker/docker-compose.yaml b/dcgm/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
 
 # Caddy will create host a site with the metrics to exposes

diff --git a/druid/tests/compose/docker-compose.yaml b/druid/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
 
   zookeeper:

diff --git a/elastic/tests/compose/elasticsearch-docker-compose.yaml b/elastic/tests/compose/elasticsearch-docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   elastic:
     image: "${ELASTIC_REGISTRY}:${ELASTIC_IMAGE}"

diff --git a/elastic/tests/compose/opensearch-docker-compose.yaml b/elastic/tests/compose/opensearch-docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   elastic:
     image: "${ELASTIC_REGISTRY}:${ELASTIC_IMAGE}"

diff --git a/esxi/tests/docker/docker-compose.yaml b/esxi/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   vsphere:
     image: vmware/vcsim:v0.35.0

diff --git a/gearmand/tests/compose/docker-compose.yaml b/gearmand/tests/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   gearman:
     image: ${DOCKER_IMAGE}:${DOCKER_TAG}

diff --git a/gitlab/tests/compose/docker-compose.yml b/gitlab/tests/compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   gitlab:
     image: ${GITLAB_IMAGE:-gitlab/gitlab-ce}:${GITLAB_VERSION}

diff --git a/gitlab_runner/tests/compose/docker-compose.yml b/gitlab_runner/tests/compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   gitlab_runner:
     image: gitlab/gitlab-runner:v${GITLAB_RUNNER_VERSION}

diff --git a/go_expvar/tests/compose/docker-compose.yaml b/go_expvar/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   go_expvar:
     build:

diff --git a/gunicorn/tests/compose/docker-compose.yaml b/gunicorn/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   gunicorn:
     build:

diff --git a/haproxy/tests/compose/haproxy.yaml b/haproxy/tests/compose/haproxy.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   haproxy:
     image: "haproxy:${HAPROXY_VERSION}"

diff --git a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   registry:
     image: goharbor/registry-photon:v1.10.11

diff --git a/harbor/tests/compose/harbor-2.0.5/docker-compose.yml b/harbor/tests/compose/harbor-2.0.5/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   registry:
     image: goharbor/registry-photon:v2.0.5

diff --git a/harbor/tests/compose/harbor-2.3.2/docker-compose.yml b/harbor/tests/compose/harbor-2.3.2/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2.3'
 services:
   registry:
     image: goharbor/registry-photon:v2.3.2

diff --git a/hazelcast/tests/docker/docker-compose.yaml b/hazelcast/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   hazelcast1:
     build:

diff --git a/hdfs_datanode/tests/compose/docker-compose.yaml b/hdfs_datanode/tests/compose/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: '3'
+
 # Inspired from
 # https://github.com/big-data-europe/docker-hadoop
 services:

diff --git a/hdfs_namenode/tests/compose/docker-compose.yaml b/hdfs_namenode/tests/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 # Inspired from
 # https://github.com/big-data-europe/docker-hadoop
 services:

diff --git a/hive/tests/compose/docker-compose.yaml b/hive/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   namenode:
     image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8

diff --git a/hivemq/tests/docker/docker-compose.yaml b/hivemq/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   hivemq1:
     image: hivemq/hivemq4:${HIVEMQ_VERSION}

diff --git a/http_check/tests/compose/docker-compose.yml b/http_check/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   # Runs at startup to build certs and exit
   cert-builder:

diff --git a/ibm_mq/tests/compose/docker-compose-v9.yml b/ibm_mq/tests/compose/docker-compose-v9.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   ibm_mq1:
     container_name: ibm_mq1

diff --git a/ibm_mq/tests/compose/docker-compose-v9cluster.yml b/ibm_mq/tests/compose/docker-compose-v9cluster.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   ibm_mq1:
     container_name: ibm_mq1

diff --git a/ignite/tests/compose/docker-compose.yml b/ignite/tests/compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   ignite:
     container_name: dd-ignite

diff --git a/impala/tests/compose/docker-compose.yaml b/impala/tests/compose/docker-compose.yaml
@@ -1,6 +1,4 @@
 # This file is based on https://github.com/apache/impala/blob/master/docker/quickstart.yml with minor improvements to make it work OOTB
-
-version: "3"
 services:
   hms:
     image: apache/impala:${IMPALA_VERSION}-impala_quickstart_hms

diff --git a/impala/tests/load_tests/docker-compose.yaml b/impala/tests/load_tests/docker-compose.yaml
@@ -1,6 +1,4 @@
 # This file is based on https://github.com/apache/impala/blob/master/docker/quickstart.yml with minor improvements to make it work OOTB
-
-version: "3"
 services:
   hms:
     image: apache/impala:${IMPALA_VERSION}-impala_quickstart_hms

diff --git a/kafka/tests/compose/docker-compose.yml b/kafka/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   zookeeper:
     image: bitnami/zookeeper:3.8.0

diff --git a/karpenter/tests/docker/docker-compose.yaml b/karpenter/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
 
 # Caddy will create host a site with the metrics to exposes

diff --git a/kong/tests/compose/docker-compose.yml b/kong/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.1'
-
 volumes:
     kong_data: {}
 

diff --git a/kubernetes_cluster_autoscaler/tests/docker/docker-compose.yaml b/kubernetes_cluster_autoscaler/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
 
   caddy:

diff --git a/kyototycoon/tests/compose/compose_kyototycoon.yaml b/kyototycoon/tests/compose/compose_kyototycoon.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   kyototycoon-standalone:
     image: "datadog/docker-library:kyototycoon_0_9_56"

diff --git a/linkerd/tests/compose/docker-compose.yaml b/linkerd/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   linkerd:
     build:

diff --git a/mapreduce/tests/compose/docker-compose.yaml b/mapreduce/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   namenode:
     image: bde2020/hadoop-namenode:2.0.0-hadoop3.2.1-java8

diff --git a/marathon/tests/compose/docker-compose.yml b/marathon/tests/compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 # References:
 # - https://github.com/fbelzunc/mesos-marathon-docker-example/blob/master/docker-compose.yml
 # - https://github.com/uzyexe/mesos-marathon-demo/blob/master/docker-compose.yml

diff --git a/marklogic/tests/compose/cluster/docker-compose.yml b/marklogic/tests/compose/cluster/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.6'
-
 services:
   bootstrap:
     image: ${MARKLOGIC_IMAGE}:${MARKLOGIC_TAG}

diff --git a/marklogic/tests/compose/standalone/docker-compose.yml b/marklogic/tests/compose/standalone/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.6'
-
 services:
   bootstrap:
     container_name: marklogic

diff --git a/mcache/tests/compose/docker-compose.yaml b/mcache/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   memcached:
     image: datadog/docker-library:memcached_SASL

diff --git a/mesos_master/tests/compose/docker-compose.yml b/mesos_master/tests/compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3.5"
 # References:
 # - https://github.com/bobrik/mesos-compose
 # - https://github.com/mesosphere/docker-containers/tree/master/mesos

diff --git a/mesos_slave/tests/compose/docker-compose.yml b/mesos_slave/tests/compose/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.5"
+
 # References:
 # - https://github.com/bobrik/mesos-compose
 # - https://github.com/mesosphere/docker-containers/tree/master/mesos

diff --git a/mongo/tests/compose/mongo-auth.yaml b/mongo/tests/compose/mongo-auth.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 # This was heavily based upon: https://github.com/chefsplate/mongo-shard-docker-compose
 services:
   standalone-auth:

diff --git a/mongo/tests/compose/mongo-shard.yaml b/mongo/tests/compose/mongo-shard.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 # This was heavily based upon: https://github.com/chefsplate/mongo-shard-docker-compose
 services:
 

diff --git a/mongo/tests/compose/mongo-standalone.yaml b/mongo/tests/compose/mongo-standalone.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   standalone:
     image: mongo:$MONGO_VERSION