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.

Sign up for GitHub

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

small fixes for docker-compose setup #16818

Merged
merged 1 commit into from
Sep 24, 2024
Merged

small fixes for docker-compose setup #16818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion examples/compose/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ vitess/examples/compose$ docker-compose up -d
### Check cluster status
Check the status of the cluster.
```
vitess/examples/compose$ docker-compose ps
vitess/examples/compose$ docker-compose ps -a
Name Command State Ports
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
compose_consul1_1 docker-entrypoint.sh agent ... Up 8300/tcp, 8301/tcp, 8301/udp, 8302/tcp, 8302/udp,
Expand Down
14 changes: 8 additions & 6 deletions examples/compose/docker-compose.beginners.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@ services:
--grpc_port $GRPC_PORT
"]
depends_on:
- consul1
- consul2
- consul3
depends_on:
consul1:
condition: service_started
consul2:
condition: service_started
consul3:
condition: service_started
external_db_host:
condition: service_healthy

Expand Down Expand Up @@ -105,8 +107,8 @@ services:
- KEYSPACE
- DB
depends_on:
- vtctld
depends_on:
vtctld:
condition: service_started
vttablet101:
condition: service_healthy

Expand Down
2 changes: 1 addition & 1 deletion examples/compose/vttablet-up.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,5 @@ exec $VTROOT/bin/vttablet \
--init_shard $shard \
--backup_storage_implementation file \
--file_backup_storage_root $VTDATAROOT/backups \
--queryserver-config-schema-reload-time 60 \
--queryserver-config-schema-reload-time 60s \
$external_db_args
Loading