Skip to content

Commit 6f9df3a

Browse files
committed
Update rpc ports to http ports & remove envoy
1 parent f75c4f8 commit 6f9df3a

File tree

6 files changed

+5
-159
lines changed

6 files changed

+5
-159
lines changed

docker/docker-compose-ci.yml

+2-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
version: '3.3'
22

33
services:
4-
envoy:
5-
build:
6-
context: ./
7-
dockerfile: ./envoy.Dockerfile
8-
image: 'grpcweb:envoy'
9-
container_name: 'envoy'
10-
restart: always
11-
ports:
12-
- '8080:8080'
13-
- '9901:9901'
14-
command: ['/etc/envoy/envoy-ci.yaml']
15-
depends_on:
16-
- yorkie
174
yorkie:
185
image: 'yorkieteam/yorkie:latest'
196
container_name: 'yorkie'
@@ -24,8 +11,8 @@ services:
2411
]
2512
restart: always
2613
ports:
27-
- '11101:11101'
28-
- '11102:11102'
14+
- '8080:8080'
15+
- '8081:8081'
2916
depends_on:
3017
- mongo
3118
mongo:

docker/docker-compose.yml

+2-22
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,11 @@
11
version: '3.3'
22

33
services:
4-
envoy:
5-
build:
6-
context: ./
7-
dockerfile: ./envoy.Dockerfile
8-
image: 'grpcweb:envoy'
9-
container_name: 'envoy'
10-
restart: always
11-
ports:
12-
- '8080:8080'
13-
- '9901:9901'
14-
command: ['/etc/envoy/envoy.yaml']
15-
depends_on:
16-
- yorkie
17-
# If you're using Mac or Windows, this special domain name("host.docker.internal" which makes containers able to connect to the host)
18-
# is supported by default.
19-
# But if you're using Linux and want an envoy container to communicate with the host,
20-
# it may help to define "host.docker.internal" in extra_hosts.
21-
# (Actually, other hostnames are available, but in that case you should update clusters[].host configurations of envoy.yaml)
22-
extra_hosts:
23-
- 'host.docker.internal:host-gateway'
244
yorkie:
255
image: 'yorkieteam/yorkie:latest'
266
container_name: 'yorkie'
277
command: ['server', '--enable-pprof']
288
restart: always
299
ports:
30-
- '11101:11101'
31-
- '11102:11102'
10+
- '8080:8080'
11+
- '8081:8081'

docker/envoy-ci.yaml

-54
This file was deleted.

docker/envoy.Dockerfile

-8
This file was deleted.

docker/envoy.yaml

-59
This file was deleted.

public/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ <h4 class="title">
324324
devtool.setCodeMirror(codemirror);
325325

326326
// 02-1. create client with RPCAddr(envoy).
327-
const client = new yorkie.Client('http://localhost:11101');
327+
const client = new yorkie.Client('http://localhost:8080');
328328
// 02-2. subscribe client event.
329329
client.subscribe(network.statusListener(statusHolder));
330330

0 commit comments

Comments
 (0)