From 7e3fa1477bbbd0482e4add1a19740c5991d7d521 Mon Sep 17 00:00:00 2001
From: diphantxm <diphantxm@yandex-team.ru>
Date: Wed, 10 Apr 2024 18:56:51 +0300
Subject: [PATCH] fix make run

---
 Makefile                |  5 -----
 docker-compose.yaml     |  2 ++
 docker/router/cfg.yaml  | 11 -----------
 docker/router/cfg2.yaml | 11 -----------
 4 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 32e2c0a06..24bd67aa0 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 998123d37..c3fece5e2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -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
@@ -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
diff --git a/docker/router/cfg.yaml b/docker/router/cfg.yaml
index 846813faf..cef5e7736 100644
--- a/docker/router/cfg.yaml
+++ b/docker/router/cfg.yaml
@@ -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
diff --git a/docker/router/cfg2.yaml b/docker/router/cfg2.yaml
index 53eb12eef..4b311e5c9 100644
--- a/docker/router/cfg2.yaml
+++ b/docker/router/cfg2.yaml
@@ -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