Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump seed timeout #2911

Merged
merged 7 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion localenv/cloud-nine-wallet/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ services:
- ../cloud-nine-wallet/seed.yml:/workspace/seed.yml
- ../cloud-nine-wallet/private-key.pem:/workspace/private-key.pem
depends_on:
- cloud-nine-backend
cloud-nine-backend:
condition: service_healthy
cloud-nine-backend:
hostname: cloud-nine-wallet-backend
image: rafiki-backend
Expand Down Expand Up @@ -78,6 +79,13 @@ services:
depends_on:
- shared-database
- shared-redis
healthcheck:
test: ["CMD", "wget", "--header=apollo-require-preflight: true", "http://localhost:3001/graphql?query=%7B__typename%7D", "-O", "/dev/null"]
start_period: 60s
start_interval: 5s
interval: 30s
retries: 1
timeout: 3s
cloud-nine-auth:
hostname: cloud-nine-wallet-auth
image: rafiki-auth
Expand Down
13 changes: 11 additions & 2 deletions localenv/happy-life-bank/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ services:
- ../happy-life-bank/seed.yml:/workspace/seed.yml
- ../happy-life-bank/private-key.pem:/workspace/private-key.pem
depends_on:
- cloud-nine-mock-ase
- happy-life-backend
happy-life-backend:
condition: service_healthy
cloud-nine-mock-ase:
condition: service_started
Comment on lines +30 to +31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why we had the cloud-nine-mock-ase dependency originally, do we need it?

Copy link
Member

@raducristianpopa raducristianpopa Sep 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was introduced in #1812. All happy-life services depend on the cloud-nine ones to avoid building the same images twice. If we remove the depends_on, on a fresh localenv startup all the images will build two times since they are not found locally.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thanks @raducristianpopa !

happy-life-backend:
hostname: happy-life-bank-backend
image: rafiki-backend
Expand Down Expand Up @@ -69,6 +71,13 @@ services:
KEY_ID: 53f2d913-e98a-40b9-b270-372d0547f23d
depends_on:
- cloud-nine-backend
healthcheck:
test: ["CMD", "wget", "--header=apollo-require-preflight: true", "http://localhost:3001/graphql?query=%7B__typename%7D", "-O", "/dev/null"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To confirm, this is just making an empty GQL request > what does this header do?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To confirm, this is just making an empty GQL request > what does this header do?

Yes, empty gql request. the header is to ensure CSRF protection doesnt block it. Took this request from apollo server docs here which mentions the header: https://www.apollographql.com/docs/apollo-server/monitoring/health-checks/

start_period: 60s
start_interval: 5s
interval: 30s
retries: 1
timeout: 3s
happy-life-auth:
hostname: happy-life-bank-auth
image: rafiki-auth
Expand Down
Loading