diff --git a/docker/airflow/docker-compose.yaml b/docker/airflow/docker-compose.yaml index df85f2acb9..ca19e3c5aa 100644 --- 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 index ae7d649ab3..3fde920161 100644 --- 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 index 6709aee98d..55bca606c5 100644 --- 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 index 11d7cd0c0c..adf610ec3a 100644 --- 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 index b81fb6435c..2d1e0958df 100644 --- 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 index 53fcc77c6e..4350322a17 100644 --- 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 index f1aa6b30ce..01dff8c0d7 100644 --- 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 index 00f7b52df1..df180e22f5 100644 --- 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 index 74b9adaeb9..36fdb5451e 100644 --- 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 index 2202f362ab..c68a4c1f5a 100644 --- 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 index 59b3459bf4..67b7641f50 100644 --- 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: \ No newline at end of file diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml index 51fbe0060a..25abf247a5 100644 --- 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 index 8d2c30c64e..9f0e263952 100644 --- 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 index 5430a8a6fc..e77b6d11ef 100644 --- 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 index 06d4e47aa4..a474d95052 100644 --- 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 index 0ee172fb1f..63f5ed9297 100644 --- 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 index 254b0a58d0..147ddde377 100644 --- 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 index c6fa019cf9..039aa55bd3 100644 --- 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 index 7cc27b9f8b..ee00e51c09 100644 --- 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 index 046ab96cf3..5f415d4000 100644 --- 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 index 6295572aac..c2a0ddb039 100644 --- 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 index ed5f203ff4..46ea765f45 100644 --- 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 index a4211acedc..8801d26edd 100644 --- 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 index e7571e4baf..1daa969af8 100644 --- 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 index d126caac6b..ad189ddbec 100644 --- 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 index bddd82e393..f4afd397e7 100644 --- 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 index 66616be98b..4d03b22598 100644 --- 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 index 9846233b36..6a3b64155a 100644 --- 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 index 865c5dee0f..e2e0eba62f 100644 --- 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