Skip to content

Commit 4b65b3a

Browse files
artur-barsegyanvasiliy-t
authored andcommitted
get rid of 'topology' instance (#3)
1 parent 90000b1 commit 4b65b3a

File tree

5 files changed

+3
-69
lines changed

5 files changed

+3
-69
lines changed

examples/kv/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ RUN yum install -y epel-release && \
77
curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - && \
88
yum install -y git make nodejs cmake gcc tarantool tarantool-devel
99

10-
COPY key-value-store /home/tarantool/key-value-store
1110
RUN tarantoolctl rocks install https://raw.githubusercontent.com/rosik/cartridge/master/cartridge-scm-1.rockspec
11+
COPY key-value-store /home/tarantool/key-value-store
1212

1313
# Tarantool binary protocol port
1414
EXPOSE 3301

examples/kv/bootstrap.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
#!/usr/bin/env bash
22

33
# You can do it manually in web ui at http://localhost:8081/
4-
curl -X POST http://localhost:8081/admin/api -d@- <<'QUERY'
4+
curl -X POST http://localhost:8082/admin/api -d@- <<'QUERY'
55
{"query":
66
"mutation {
77
j1: join_server(
8-
uri:\"topology:3301\",
9-
instance_uuid: \"aaaaaaaa-aaaa-4000-b000-000000000001\",
10-
replicaset_uuid: \"aaaaaaaa-0000-4000-b000-000000000000\",
11-
roles: [\"topology\"]
12-
)
13-
j2: join_server(
148
uri:\"router:3301\",
159
instance_uuid: \"bbbbbbbb-bbbb-4000-b000-000000000001\",
1610
replicaset_uuid: \"bbbbbbbb-0000-4000-b000-000000000000\",
1711
roles: [\"router\"],
1812
timeout: 5
1913
)
20-
j3: join_server(
14+
j2: join_server(
2115
uri:\"storage:3301\",
2216
instance_uuid: \"cccccccc-cccc-4000-b000-000000000001\",
2317
replicaset_uuid: \"cccccccc-0000-4000-b000-000000000000\",

examples/kv/docker-compose.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
version: '3'
22
services:
3-
topology:
4-
build:
5-
context: ./
6-
dockerfile: Dockerfile
7-
ports:
8-
- "8081:8081"
9-
networks:
10-
kv:
11-
environment:
12-
- TARANTOOL_HTTP_PORT=8081
13-
- TARANTOOL_ADVERTISE_URI=topology:3301
14-
- TARANTOOL_WORK_DIR=/data/tarantool
15-
- TARANTOOL_INSTANCE_NAME=topology
16-
173
router:
184
build:
195
context: ./
@@ -38,8 +24,6 @@ services:
3824
- TARANTOOL_ADVERTISE_URI=storage:3301
3925
- TARANTOOL_WORK_DIR=/data/tarantool
4026
- TARANTOOL_INSTANCE_NAME=storage
41-
depends_on:
42-
- topology
4327

4428
networks:
4529
kv:

examples/kv/key-value-store/init.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ local ok, err = cartridge.cfg({
3535
'cartridge.roles.vshard-storage',
3636
'key-value.key-value',
3737
'key-value.storage',
38-
'key-value.topology'
3938
},
4039
}, {memtx_memory = memtx_memory})
4140

examples/kv/key-value-store/key-value/topology.lua

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)