chore: remove obsolete attribute from docker (#11573)

anshbansal · web-flow · commit 867007f209e6 · 2024-10-09T20:52:50.000+05:30
diff --git a/docker/airflow/docker-compose.yaml b/docker/airflow/docker-compose.yaml
@@ -41,7 +41,6 @@
 #
 # Feel free to modify this file to suit your needs.
 ---
-version: '3'
 x-airflow-common:
   &airflow-common
   image: ${AIRFLOW_IMAGE_NAME:-acryldata/airflow-datahub:latest}
diff --git a/docker/cassandra/docker-compose.cassandra.yml b/docker/cassandra/docker-compose.cassandra.yml
@@ -1,6 +1,5 @@
 # Override to use Cassandra as a backing store for datahub-gms.
 ---
-version: '3.8'
 services:
   cassandra:
     hostname: cassandra
diff --git a/docker/docker-compose-with-cassandra.yml b/docker/docker-compose-with-cassandra.yml
@@ -4,7 +4,6 @@
 
 # NOTE: This file does not build! No dockerfiles are set. See the README.md in this directory.
 ---
-version: '3.9'
 services:
   datahub-frontend-react:
     hostname: datahub-frontend-react
diff --git a/docker/docker-compose-without-neo4j.override.yml b/docker/docker-compose-without-neo4j.override.yml
@@ -1,5 +1,4 @@
 ---
-version: '3.9'
 services:
   datahub-gms:
     env_file: datahub-gms/env/docker-without-neo4j.env
diff --git a/docker/docker-compose-without-neo4j.postgres.override.yml b/docker/docker-compose-without-neo4j.postgres.override.yml
@@ -1,6 +1,5 @@
 # Override to use PostgreSQL as a backing store for datahub-gms.
 ---
-version: '3.9'
 services:
   datahub-gms:
     env_file:
diff --git a/docker/docker-compose-without-neo4j.yml b/docker/docker-compose-without-neo4j.yml
@@ -4,7 +4,6 @@
 
 # NOTE: This file will cannot build! No dockerfiles are set. See the README.md in this directory.
 ---
-version: '3.9'
 services:
   datahub-frontend-react:
     hostname: datahub-frontend-react
diff --git a/docker/docker-compose.consumers-without-neo4j.yml b/docker/docker-compose.consumers-without-neo4j.yml
@@ -1,5 +1,4 @@
 # Service definitions for standalone Kafka consumer containers.
-version: '3.9'
 services:
   datahub-gms:
     environment:
diff --git a/docker/docker-compose.consumers.dev.yml b/docker/docker-compose.consumers.dev.yml
@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   datahub-mae-consumer:
     image: acryldata/datahub-mae-consumer:debug
diff --git a/docker/docker-compose.consumers.yml b/docker/docker-compose.consumers.yml
@@ -1,5 +1,4 @@
 # Service definitions for standalone Kafka consumer containers.
-version: '3.9'
 services:
   datahub-gms:
     environment:
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
@@ -8,7 +8,6 @@
 # To make a JVM app debuggable via IntelliJ, go to its env file and add JVM debug flags, and then add the JVM debug
 # port to this file.
 ---
-version: '3.9'
 services:
   datahub-frontend-react:
     image: acryldata/datahub-frontend-react:head
diff --git a/docker/docker-compose.kafka-setup.yml b/docker/docker-compose.kafka-setup.yml
@@ -1,3 +1,2 @@
 # Empty docker compose for kafka-setup as we have moved kafka-setup back into the main compose
-version: '3.9'
 services:
diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml
@@ -1,6 +1,5 @@
 # Default override to use MySQL as a backing store for datahub-gms (same as docker-compose.mysql.yml).
 ---
-version: '3.9'
 services:
   datahub-gms:
     env_file: datahub-gms/env/docker.env
diff --git a/docker/docker-compose.tools.yml b/docker/docker-compose.tools.yml
@@ -1,6 +1,5 @@
 # Tools useful for operating & debugging DataHub.
 ---
-version: '3.8'
 services:
   kafka-rest-proxy:
     image: confluentinc/cp-kafka-rest:7.4.0
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -4,7 +4,6 @@
 
 # NOTE: This file does not build! No dockerfiles are set. See the README.md in this directory.
 ---
-version: '3.9'
 services:
   datahub-frontend-react:
     hostname: datahub-frontend-react
diff --git a/docker/ingestion/docker-compose.yml b/docker/ingestion/docker-compose.yml
@@ -1,5 +1,4 @@
 ---
-version: '3.5'
 services:
   ingestion:
     build:
diff --git a/docker/mariadb/docker-compose.mariadb.yml b/docker/mariadb/docker-compose.mariadb.yml
@@ -1,6 +1,5 @@
 # Override to use MariaDB as a backing store for datahub-gms.
 ---
-version: '3.8'
 services:
   mariadb:
     hostname: mariadb
diff --git a/docker/monitoring/docker-compose.consumers.monitoring.yml b/docker/monitoring/docker-compose.consumers.monitoring.yml
@@ -1,5 +1,4 @@
 ---
-version: '3.8'
 services:
   datahub-mae-consumer:
     environment:
diff --git a/docker/monitoring/docker-compose.monitoring.yml b/docker/monitoring/docker-compose.monitoring.yml
@@ -1,5 +1,4 @@
 ---
-version: '3.9'
 services:
   datahub-frontend-react:
     environment:
diff --git a/docker/mysql/docker-compose.mysql.yml b/docker/mysql/docker-compose.mysql.yml
@@ -1,6 +1,5 @@
 # Override to use MySQL as a backing store for datahub-gms.
 ---
-version: '3.8'
 services:
   mysql:
     hostname: mysql
diff --git a/docker/quickstart/docker-compose-m1.quickstart.yml b/docker/quickstart/docker-compose-m1.quickstart.yml
@@ -291,7 +291,6 @@ services:
     volumes:
     - zkdata:/var/lib/zookeeper/data
     - zklogs:/var/lib/zookeeper/log
-version: '3.9'
 volumes:
   broker: null
   esdata: null
diff --git a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
@@ -266,7 +266,6 @@ services:
     volumes:
     - zkdata:/var/lib/zookeeper/data
     - zklogs:/var/lib/zookeeper/log
-version: '3.9'
 volumes:
   broker: null
   esdata: null
diff --git a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
@@ -266,7 +266,6 @@ services:
     volumes:
     - zkdata:/var/lib/zookeeper/data
     - zklogs:/var/lib/zookeeper/log
-version: '3.9'
 volumes:
   broker: null
   esdata: null
diff --git a/docker/quickstart/docker-compose.consumers-without-neo4j.quickstart.yml b/docker/quickstart/docker-compose.consumers-without-neo4j.quickstart.yml
@@ -55,4 +55,3 @@ services:
     image: ${DATAHUB_MCE_CONSUMER_IMAGE:-acryldata/datahub-mce-consumer}:${DATAHUB_VERSION:-head}
     ports:
     - 9090:9090
-version: '3.9'
diff --git a/docker/quickstart/docker-compose.consumers.quickstart.yml b/docker/quickstart/docker-compose.consumers.quickstart.yml
@@ -69,4 +69,3 @@ services:
     image: ${DATAHUB_MCE_CONSUMER_IMAGE:-acryldata/datahub-mce-consumer}:${DATAHUB_VERSION:-head}
     ports:
     - 9090:9090
-version: '3.9'
diff --git a/docker/quickstart/docker-compose.kafka-setup.quickstart.yml b/docker/quickstart/docker-compose.kafka-setup.quickstart.yml
@@ -1,2 +1 @@
 services: {}
-version: '3.9'
diff --git a/docker/quickstart/docker-compose.monitoring.quickstart.yml b/docker/quickstart/docker-compose.monitoring.quickstart.yml
@@ -41,6 +41,5 @@ services:
     - 9089:9090
     volumes:
     - ../monitoring/prometheus.yaml:/etc/prometheus/prometheus.yml
-version: '3.9'
 volumes:
   grafana-storage: null
diff --git a/docker/quickstart/docker-compose.quickstart.yml b/docker/quickstart/docker-compose.quickstart.yml
@@ -291,7 +291,6 @@ services:
     volumes:
     - zkdata:/var/lib/zookeeper/data
     - zklogs:/var/lib/zookeeper/log
-version: '3.9'
 volumes:
   broker: null
   esdata: null
diff --git a/docker/quickstart/generate_docker_quickstart.py b/docker/quickstart/generate_docker_quickstart.py
@@ -120,11 +120,6 @@ def modify_docker_config(base_path, docker_yaml_config):
                 elif volumes[i].startswith("./"):
                     volumes[i] = "." + volumes[i]
 
-    # 10. Set docker compose version to 3.
-    # We need at least this version, since we use features like start_period for
-    # healthchecks (with services dependencies based on them) and shell-like variable interpolation.
-    docker_yaml_config["version"] = "3.9"
-
 
 def dedup_env_vars(merged_docker_config):
     for service in merged_docker_config["services"]:
diff --git a/metadata-integration/java/spark-lineage-legacy/spark-smoke-test/docker/spark-docker-compose.yml b/metadata-integration/java/spark-lineage-legacy/spark-smoke-test/docker/spark-docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3.6"
 services:
   spark-master:
     image: spark-master

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@`
`41`	`41`	`#`
`42`	`42`	`# Feel free to modify this file to suit your needs.`
`43`	`43`	`---`
`44`		`-version: '3'`
`45`	`44`	`x-airflow-common:`
`46`	`45`	`&airflow-common`
`47`	`46`	`image: ${AIRFLOW_IMAGE_NAME:-acryldata/airflow-datahub:latest}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`---`
`2`		`-version: '3.9'`
`3`	`2`	`services:`
`4`	`3`	`datahub-gms:`
`5`	`4`	`env_file: datahub-gms/env/docker-without-neo4j.env`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`# Service definitions for standalone Kafka consumer containers.`
`2`		`-version: '3.9'`
`3`	`2`	`services:`
`4`	`3`	`datahub-gms:`
`5`	`4`	`environment:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-version: '3.9'`
`2`	`1`	`services:`
`3`	`2`	`datahub-mae-consumer:`
`4`	`3`	`image: acryldata/datahub-mae-consumer:debug`