From e4023705f603eb8b5d616f52c4630d692becbd7a Mon Sep 17 00:00:00 2001 From: adnanhemani Date: Fri, 18 Apr 2025 15:23:31 -0700 Subject: [PATCH] Re-instate dependencies between Docker Compose services --- getting-started/eclipselink/README.md | 2 +- .../eclipselink/docker-compose-bootstrap-db.yml | 6 +++++- .../eclipselink/docker-compose-postgres.yml | 10 +++++++++- getting-started/eclipselink/docker-compose.yml | 6 ++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/getting-started/eclipselink/README.md b/getting-started/eclipselink/README.md index 0f41d8da15..765ccf379d 100644 --- a/getting-started/eclipselink/README.md +++ b/getting-started/eclipselink/README.md @@ -71,7 +71,7 @@ This example requires `jq` to be installed on your machine. ```shell curl -v http://127.0.0.1:8181/api/management/v1/principal-roles -H "Authorization: Bearer $POLARIS_TOKEN" - curl -v http://127.0.0.1:8181/api/management/v1/catalogs/polaris_demo -H "Authorization: Bearer $POLARIS_TOKEN" + curl -v http://127.0.0.1:8181/api/management/v1/catalogs/quickstart_catalog -H "Authorization: Bearer $POLARIS_TOKEN" ``` 6. Using Trino CLI: To access the Trino CLI, run this command: diff --git a/getting-started/eclipselink/docker-compose-bootstrap-db.yml b/getting-started/eclipselink/docker-compose-bootstrap-db.yml index 6e1ab80751..5861f59166 100644 --- a/getting-started/eclipselink/docker-compose-bootstrap-db.yml +++ b/getting-started/eclipselink/docker-compose-bootstrap-db.yml @@ -29,4 +29,8 @@ services: command: - "bootstrap" - "--realm=POLARIS" - - "--credential=POLARIS,root,s3cr3t" \ No newline at end of file + - "--credential=POLARIS,root,s3cr3t" + polaris: + depends_on: + polaris-bootstrap: + condition: service_completed_successfully \ No newline at end of file diff --git a/getting-started/eclipselink/docker-compose-postgres.yml b/getting-started/eclipselink/docker-compose-postgres.yml index 1e86a8c0ea..321c19e54b 100644 --- a/getting-started/eclipselink/docker-compose-postgres.yml +++ b/getting-started/eclipselink/docker-compose-postgres.yml @@ -42,4 +42,12 @@ services: test: "pg_isready -U postgres" interval: 5s timeout: 2s - retries: 15 \ No newline at end of file + retries: 15 + polaris-bootstrap: + depends_on: + postgres: + condition: service_healthy + polaris: + depends_on: + postgres: + condition: service_healthy \ No newline at end of file diff --git a/getting-started/eclipselink/docker-compose.yml b/getting-started/eclipselink/docker-compose.yml index 4861675991..5ece9c6069 100644 --- a/getting-started/eclipselink/docker-compose.yml +++ b/getting-started/eclipselink/docker-compose.yml @@ -56,6 +56,9 @@ services: spark-sql: image: apache/spark:3.5.5-java17-python3 + depends_on: + polaris-setup: + condition: service_completed_successfully stdin_open: true tty: true ports: @@ -81,6 +84,9 @@ services: trino: image: trinodb/trino:latest + depends_on: + polaris-setup: + condition: service_completed_successfully stdin_open: true tty: true ports: