diff --git a/dff/utils/docker/entrypoint_stats.sh b/dff/utils/docker/entrypoint_stats.sh index 663a39b75..cac946f7d 100644 --- a/dff/utils/docker/entrypoint_stats.sh +++ b/dff/utils/docker/entrypoint_stats.sh @@ -2,6 +2,7 @@ export SERVER_THREADS_AMOUNT=8 set -m nohup /bin/bash /usr/bin/run-server.sh & +sleep 5 superset fab create-admin --firstname superset --lastname admin --username $SUPERSET_USERNAME --email admin@admin.com --password $SUPERSET_PASSWORD superset db upgrade superset init diff --git a/dff/utils/docker/superset_config_docker.py b/dff/utils/docker/superset_config_docker.py index 5b91059d5..ca138927f 100644 --- a/dff/utils/docker/superset_config_docker.py +++ b/dff/utils/docker/superset_config_docker.py @@ -30,4 +30,3 @@ os.getenv("SUPERSET_METADATA_PORT"), os.getenv("POSTGRES_DB"), ) -SQLALCHEMY_ECHO = True diff --git a/docker-compose.yml b/docker-compose.yml index adf18f024..a3dffc883 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,7 +52,7 @@ services: image: ghcr.io/deeppavlov/superset_df_dashboard:latest depends_on: dashboard-metadata: - condition: service_started + condition: service_healthy clickhouse: condition: service_started profiles: @@ -70,6 +70,11 @@ services: ports: - 5433:5433 command: -p 5433 + healthcheck: + test: pg_isready -p 5433 + interval: 4s + timeout: 3s + retries: 3 clickhouse: env_file: [.env_file] image: clickhouse/clickhouse-server:latest