feat(quickstart): remove container_name

Because we have `--remove-orphans` in the quickstart cli, this should be ok to use on existing quickstarts as well. Related to #9808
datahub-project · Feb 9, 2024 · c650258 · c650258
1 parent 93a7afb
commit c650258
Show file tree

Hide file tree

Showing 25 changed files with 0 additions and 169 deletions.
diff --git a/docker/cassandra/docker-compose.cassandra.yml b/docker/cassandra/docker-compose.cassandra.yml
@@ -3,7 +3,6 @@
 version: '3.8'
 services:
   cassandra:
-    container_name: cassandra
     hostname: cassandra
     image: cassandra:3.11
     ports:
@@ -16,7 +15,6 @@ services:
     volumes:
       - cassandradata:/var/lib/cassandra
   cassandra-load-keyspace:
-    container_name: cassandra-setup
     image: cassandra:3.11
     depends_on:
       cassandra:

diff --git a/docker/docker-compose-with-cassandra.yml b/docker/docker-compose-with-cassandra.yml
@@ -7,7 +7,6 @@
 version: '3.9'
 services:
   datahub-frontend-react:
-    container_name: datahub-frontend-react
     hostname: datahub-frontend-react
     image: ${DATAHUB_FRONTEND_IMAGE:-linkedin/datahub-frontend-react}:${DATAHUB_VERSION:-head}
     ports:
@@ -22,7 +21,6 @@ services:
     volumes:
       - ${HOME}/.datahub/plugins:/etc/datahub/plugins
   datahub-actions:
-    container_name: datahub-actions
     hostname: actions
     image: ${DATAHUB_ACTIONS_IMAGE:-acryldata/datahub-actions}:${ACTIONS_VERSION:-head}
     env_file: datahub-actions/env/docker.env
@@ -33,7 +31,6 @@ services:
       datahub-gms:
         condition: service_healthy
   datahub-gms:
-    container_name: datahub-gms
     hostname: datahub-gms
     image: ${DATAHUB_GMS_IMAGE:-linkedin/datahub-gms}:${DATAHUB_VERSION:-head}
     ports:
@@ -54,7 +51,6 @@ services:
     volumes:
     - ${HOME}/.datahub/plugins:/etc/datahub/plugins
   datahub-upgrade:
-    container_name: datahub-upgrade
     hostname: datahub-upgrade
     image: ${DATAHUB_UPGRADE_IMAGE:-acryldata/datahub-upgrade}:${DATAHUB_VERSION:-head}
     command:
@@ -76,7 +72,6 @@ services:
       schema-registry:
         condition: service_healthy
   cassandra-setup:
-    container_name: cassandra-setup
     hostname: cassandra-setup
     image: cassandra:3.11
     command: /bin/bash -c "cqlsh cassandra -f /init.cql"
@@ -89,7 +84,6 @@ services:
       datahub_setup_job: true
   # This "container" is a workaround to pre-create search indices
   elasticsearch-setup:
-    container_name: elasticsearch-setup
     hostname: elasticsearch-setup
     image: ${DATAHUB_ELASTIC_SETUP_IMAGE:-linkedin/datahub-elasticsearch-setup}:${DATAHUB_VERSION:-head}
     build:
@@ -105,7 +99,6 @@ services:
     labels:
       datahub_setup_job: true
   cassandra:
-    container_name: cassandra
     hostname: cassandra
     image: cassandra:3.11
     ports:
@@ -118,7 +111,6 @@ services:
     volumes:
       - cassandradata:/var/lib/cassandra
   elasticsearch:
-    container_name: elasticsearch
     hostname: elasticsearch
     image: ${DATAHUB_SEARCH_IMAGE:-elasticsearch}:${DATAHUB_SEARCH_TAG:-7.10.1}
     ports:
@@ -136,7 +128,6 @@ services:
     volumes:
       - esdata:/usr/share/elasticsearch/data
   neo4j:
-    container_name: neo4j
     hostname: neo4j
     image: neo4j:4.0.6
     ports:
@@ -152,7 +143,6 @@ services:
     volumes:
       - neo4jdata:/data
   schema-registry:
-    container_name: schema-registry
     hostname: schema-registry
     image: confluentinc/cp-schema-registry:7.4.0
     ports:
@@ -168,7 +158,6 @@ services:
       broker:
         condition: service_healthy
   broker:
-    container_name: broker
     hostname: broker
     image: confluentinc/cp-kafka:7.4.0
     ports:
@@ -187,7 +176,6 @@ services:
     volumes:
       - broker:/var/lib/kafka/data/
   zookeeper:
-    container_name: zookeeper
     hostname: zookeeper
     image: confluentinc/cp-zookeeper:7.4.0
     ports:

diff --git a/docker/docker-compose-without-neo4j.override.yml b/docker/docker-compose-without-neo4j.override.yml
@@ -12,7 +12,6 @@ services:
     volumes:
       - ${HOME}/.datahub/plugins:/etc/datahub/plugins
   datahub-upgrade:
-    container_name: datahub-upgrade
     hostname: datahub-upgrade
     image: ${DATAHUB_UPGRADE_IMAGE:-acryldata/datahub-upgrade}:${DATAHUB_VERSION:-head}
     command:
@@ -30,7 +29,6 @@ services:
       kafka-setup:
         condition: service_completed_successfully
   mysql-setup:
-    container_name: mysql-setup
     hostname: mysql-setup
     image: ${DATAHUB_MYSQL_SETUP_IMAGE:-acryldata/datahub-mysql-setup}:${DATAHUB_VERSION:-head}
     build:
@@ -46,7 +44,6 @@ services:
     environment:
       - DATAHUB_PRECREATE_TOPICS=${DATAHUB_PRECREATE_TOPICS:-false}
   mysql:
-    container_name: mysql
     hostname: mysql
     image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password

diff --git a/docker/docker-compose-without-neo4j.postgres.override.yml b/docker/docker-compose-without-neo4j.postgres.override.yml
@@ -16,7 +16,6 @@ services:
       - ${HOME}/.datahub/plugins:/etc/datahub/plugins
 
   datahub-upgrade:
-    container_name: datahub-upgrade
     hostname: datahub-upgrade
     image: ${DATAHUB_UPGRADE_IMAGE:-acryldata/datahub-upgrade}:${DATAHUB_VERSION:-head}
     command:
@@ -37,7 +36,6 @@ services:
         condition: service_completed_successfully
 
   postgres-setup:
-    container_name: postgres-setup
     hostname: postgres-setup
     image: ${DATAHUB_POSTGRES_SETUP_IMAGE:-acryldata/datahub-postgres-setup}:${DATAHUB_VERSION:-head}
     build:
@@ -51,7 +49,6 @@ services:
       datahub_setup_job: true
 
   postgres:
-    container_name: postgres
     hostname: postgres
     image: postgres:${DATAHUB_POSTGRES_VERSION:-12.3}
     env_file: postgres/env/docker.env

diff --git a/docker/docker-compose-without-neo4j.yml b/docker/docker-compose-without-neo4j.yml
@@ -7,7 +7,6 @@
 version: '3.9'
 services:
   datahub-frontend-react:
-    container_name: datahub-frontend-react
     hostname: datahub-frontend-react
     image: ${DATAHUB_FRONTEND_IMAGE:-linkedin/datahub-frontend-react}:${DATAHUB_VERSION:-head}
     ports:
@@ -23,7 +22,6 @@ services:
     - ${HOME}/.datahub/plugins:/etc/datahub/plugins
 
   datahub-actions:
-    container_name: datahub-actions
     hostname: actions
     image: ${DATAHUB_ACTIONS_IMAGE:-acryldata/datahub-actions}:${ACTIONS_VERSION:-head}
     env_file: datahub-actions/env/docker.env
@@ -34,7 +32,6 @@ services:
       datahub-gms:
         condition: service_healthy
   datahub-gms:
-    container_name: datahub-gms
     hostname: datahub-gms
     image: ${DATAHUB_GMS_IMAGE:-linkedin/datahub-gms}:${DATAHUB_VERSION:-head}
     ports:
@@ -57,7 +54,6 @@ services:
     volumes:
     - ${HOME}/.datahub/plugins:/etc/datahub/plugins
   datahub-upgrade:
-    container_name: datahub-upgrade
     hostname: datahub-upgrade
     image: ${DATAHUB_UPGRADE_IMAGE:-acryldata/datahub-upgrade}:${DATAHUB_VERSION:-head}
     command:
@@ -76,7 +72,6 @@ services:
       datahub_setup_job: true
   # This "container" is a workaround to pre-create search indices
   elasticsearch-setup:
-    container_name: elasticsearch-setup
     hostname: elasticsearch-setup
     image: ${DATAHUB_ELASTIC_SETUP_IMAGE:-linkedin/datahub-elasticsearch-setup}:${DATAHUB_VERSION:-head}
     build:
@@ -92,7 +87,6 @@ services:
     labels:
       datahub_setup_job: true
   kafka-setup:
-    container_name: kafka-setup
     hostname: kafka-setup
     image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
     build:
@@ -107,7 +101,6 @@ services:
     labels:
       datahub_setup_job: true
   elasticsearch:
-    container_name: elasticsearch
     hostname: elasticsearch
     image: ${DATAHUB_SEARCH_IMAGE:-elasticsearch}:${DATAHUB_SEARCH_TAG:-7.10.1}
     ports:
@@ -129,7 +122,6 @@ services:
     volumes:
     - esdata:/usr/share/elasticsearch/data
   schema-registry:
-    container_name: schema-registry
     hostname: schema-registry
     image: confluentinc/cp-schema-registry:7.4.0
     ports:
@@ -145,7 +137,6 @@ services:
       broker:
         condition: service_healthy
   broker:
-    container_name: broker
     hostname: broker
     image: confluentinc/cp-kafka:7.4.0
     ports:
@@ -163,7 +154,6 @@ services:
     volumes:
     - broker:/var/lib/kafka/data/
   zookeeper:
-    container_name: zookeeper
     hostname: zookeeper
     image: confluentinc/cp-zookeeper:7.4.0
     ports:

diff --git a/docker/docker-compose.consumers-without-neo4j.yml b/docker/docker-compose.consumers-without-neo4j.yml
@@ -6,7 +6,6 @@ services:
     - MAE_CONSUMER_ENABLED=false
     - MCE_CONSUMER_ENABLED=false
   datahub-mae-consumer:
-    container_name: datahub-mae-consumer
     hostname: datahub-mae-consumer
     image: ${DATAHUB_MAE_CONSUMER_IMAGE:-linkedin/datahub-mae-consumer}:${DATAHUB_VERSION:-head}
     ports:
@@ -19,7 +18,6 @@ services:
       - KAFKA_CONSUMER_STOP_ON_DESERIALIZATION_ERROR=${KAFKA_CONSUMER_STOP_ON_DESERIALIZATION_ERROR:-true}
       - KAFKA_CONSUMER_HEALTH_CHECK_ENABLED=${KAFKA_CONSUMER_HEALTH_CHECK_ENABLED:-true}
   datahub-mce-consumer:
-    container_name: datahub-mce-consumer
     hostname: datahub-mce-consumer
     image: ${DATAHUB_MCE_CONSUMER_IMAGE:-linkedin/datahub-mce-consumer}:${DATAHUB_VERSION:-head}
     ports:

diff --git a/docker/docker-compose.consumers.yml b/docker/docker-compose.consumers.yml
@@ -6,7 +6,6 @@ services:
     - MAE_CONSUMER_ENABLED=false
     - MCE_CONSUMER_ENABLED=false
   datahub-mae-consumer:
-    container_name: datahub-mae-consumer
     hostname: datahub-mae-consumer
     image: ${DATAHUB_MAE_CONSUMER_IMAGE:-linkedin/datahub-mae-consumer}:${DATAHUB_VERSION:-head}
     ports:
@@ -22,7 +21,6 @@ services:
       neo4j:
         condition: service_healthy
   datahub-mce-consumer:
-    container_name: datahub-mce-consumer
     hostname: datahub-mce-consumer
     image: ${DATAHUB_MCE_CONSUMER_IMAGE:-linkedin/datahub-mce-consumer}:${DATAHUB_VERSION:-head}
     ports:

diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml
@@ -14,7 +14,6 @@ services:
     environment:
       - GRAPH_SERVICE_IMPL=${GRAPH_SERVICE_IMPL:-elasticsearch}
   mysql-setup:
-    container_name: mysql-setup
     hostname: mysql-setup
     image: ${DATAHUB_MYSQL_SETUP_IMAGE:-acryldata/datahub-mysql-setup}:${DATAHUB_VERSION:-head}
     build:
@@ -30,7 +29,6 @@ services:
     environment:
     - DATAHUB_PRECREATE_TOPICS=${DATAHUB_PRECREATE_TOPICS:-false}
   mysql:
-    container_name: mysql
     hostname: mysql
     image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password

diff --git a/docker/docker-compose.tools.yml b/docker/docker-compose.tools.yml
@@ -6,7 +6,6 @@ services:
     image: confluentinc/cp-kafka-rest:7.4.0
     env_file: kafka-rest-proxy/env/docker.env
     hostname: kafka-rest-proxy
-    container_name: kafka-rest-proxy
     ports:
       - "8082:8082"
     depends_on:
@@ -18,7 +17,6 @@ services:
     image: landoop/kafka-topics-ui:0.9.4
     env_file: kafka-topics-ui/env/docker.env
     hostname: kafka-topics-ui
-    container_name: kafka-topics-ui
     ports:
       - "18000:8000"
     depends_on:
@@ -30,7 +28,6 @@ services:
   kibana:
     image: kibana:7.10.1
     env_file: kibana/env/docker.env
-    container_name: kibana
     hostname: kibana
     ports:
       - "5601:5601"

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -7,7 +7,6 @@
 version: '3.9'
 services:
   datahub-frontend-react:
-    container_name: datahub-frontend-react
     hostname: datahub-frontend-react
     image: ${DATAHUB_FRONTEND_IMAGE:-linkedin/datahub-frontend-react}:${DATAHUB_VERSION:-head}
     ports:
@@ -22,7 +21,6 @@ services:
     volumes:
     - ${HOME}/.datahub/plugins:/etc/datahub/plugins
   datahub-actions:
-    container_name: datahub-actions
     hostname: actions
     image: ${DATAHUB_ACTIONS_IMAGE:-acryldata/datahub-actions}:${ACTIONS_VERSION:-head}
     env_file: datahub-actions/env/docker.env
@@ -33,7 +31,6 @@ services:
       datahub-gms:
         condition: service_healthy
   datahub-gms:
-    container_name: datahub-gms
     hostname: datahub-gms
     image: ${DATAHUB_GMS_IMAGE:-linkedin/datahub-gms}:${DATAHUB_VERSION:-head}
     environment:
@@ -55,7 +52,6 @@ services:
     volumes:
     - ${HOME}/.datahub/plugins:/etc/datahub/plugins
   datahub-upgrade:
-    container_name: datahub-upgrade
     hostname: datahub-upgrade
     image: ${DATAHUB_UPGRADE_IMAGE:-acryldata/datahub-upgrade}:${DATAHUB_VERSION:-head}
     command:
@@ -78,7 +74,6 @@ services:
         condition: service_healthy
   # This "container" is a workaround to pre-create search indices
   elasticsearch-setup:
-    container_name: elasticsearch-setup
     hostname: elasticsearch-setup
     image: ${DATAHUB_ELASTIC_SETUP_IMAGE:-linkedin/datahub-elasticsearch-setup}:${DATAHUB_VERSION:-head}
     build:
@@ -97,7 +92,6 @@ services:
   # This is not required in most cases, kept here for backwards compatibility with older clients that
   # explicitly wait for this container
   kafka-setup:
-    container_name: kafka-setup
     hostname: kafka-setup
     image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
     build:
@@ -112,7 +106,6 @@ services:
     labels:
       datahub_setup_job: true
   elasticsearch:
-    container_name: elasticsearch
     hostname: elasticsearch
     image: ${DATAHUB_SEARCH_IMAGE:-elasticsearch}:${DATAHUB_SEARCH_TAG:-7.10.1}
     ports:
@@ -134,7 +127,6 @@ services:
     volumes:
     - esdata:/usr/share/elasticsearch/data
   neo4j:
-    container_name: neo4j
     hostname: neo4j
     image: neo4j:4.4.9-community
     ports:
@@ -150,7 +142,6 @@ services:
     volumes:
     - neo4jdata:/data
   schema-registry:
-    container_name: schema-registry
     hostname: schema-registry
     image: confluentinc/cp-schema-registry:7.4.0
     ports:
@@ -166,7 +157,6 @@ services:
       broker:
         condition: service_healthy
   broker:
-    container_name: broker
     hostname: broker
     image: confluentinc/cp-kafka:7.4.0
     ports:
@@ -184,7 +174,6 @@ services:
     volumes:
     - broker:/var/lib/kafka/data/
   zookeeper:
-    container_name: zookeeper
     hostname: zookeeper
     image: confluentinc/cp-zookeeper:7.4.0
     ports: