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

Jump to bottom

Fix make run #610

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Fix make run #610

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
5 changes: 0 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ clean: clean_feature_test

run: build_images
docker compose up -d --remove-orphans --build router router2 coordinator shard1 shard2 qdb01
docker compose build client
docker compose run --entrypoint /bin/bash client

proxy_2sh_run:
./spqr-router run --config ./examples/2shardproxy.yaml -d --proto-debug
Expand Down Expand Up @@ -107,9 +105,6 @@ gorm_regress: build_images
xproto_regress: build_images
docker compose -f test/xproto/docker-compose.yaml down && docker compose -f test/xproto/docker-compose.yaml run --remove-orphans --build regress

e2e: build_images
docker compose up --remove-orphans --exit-code-from client --build router coordinator shard1 shard2 qdb01 client

stress: build_images
docker compose -f test/stress/docker-compose.yaml up --remove-orphans --exit-code-from stress --build router shard1 shard2 stress

Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ services:
environment:
- ROUTER_CONFIG=/spqr/docker/router/cfg.yaml
- COORDINATOR_CONFIG=/spqr/docker/coordinator/cfg.yaml
- ROUTER_LOG='router.log'
router2:
build:
dockerfile: ./docker/router/Dockerfile
Expand All @@ -73,6 +74,7 @@ services:
environment:
- ROUTER_CONFIG=/spqr/docker/router/cfg2.yaml
- COORDINATOR_CONFIG=/spqr/docker/coordinator/cfg2.yaml
- ROUTER_LOG='router.log'
slicer:
build:
dockerfile: ./docker/slicer/Dockerfile
Expand Down
11 changes: 0 additions & 11 deletions docker/router/cfg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,6 @@ shards:
type: DATA
hosts:
- 'spqr_shard_2:6432'
w1:
tls:
key_file: /etc/odyssey/ssl/server.key
sslmode: disable
cert_file: /etc/odyssey/ssl/server.crt
db: db1
usr: user1
pwd: 12345678
type: WORLD
hosts:
- 'spqr_world:6432'
backend_rules:
- usr: user1
db: db1
Expand Down
11 changes: 0 additions & 11 deletions docker/router/cfg2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,6 @@ shards:
type: DATA
hosts:
- 'spqr_shard_2:6432'
w1:
tls:
key_file: /etc/odyssey/ssl/server.key
sslmode: disable
cert_file: /etc/odyssey/ssl/server.crt
db: db1
usr: user1
pwd: 12345678
type: WORLD
hosts:
- 'spqr_world:6432'
backend_rules:
- usr: user1
db: db1
Expand Down
Loading