Skip to content

Commit eea0c38

Browse files
NathanFlurryMasterPtato
authored andcommitted
feat(pegboard): expose rivet server from within containers for docker compose
1 parent a130124 commit eea0c38

File tree

5 files changed

+177
-169
lines changed

5 files changed

+177
-169
lines changed

docker/dev-full/docker-compose.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,16 @@ services:
213213
- RUST_LOG=debug,hyper=info
214214
stop_grace_period: 0s
215215
depends_on:
216+
# HACK: rivet-server dependency since we need to do a DNS lookup in entrypoint.sh for the iptables chain
217+
rivet-server:
218+
condition: service_healthy
216219
rivet-edge-server:
217220
condition: service_healthy
218221
foundationdb:
219222
condition: service_healthy
220223
volumes:
221224
# - ./rivet-client/entrypoint.sh:/usr/local/bin/entrypoint.sh:ro
222225
- ./rivet-client/config.jsonc:/etc/rivet-client/config.jsonc:ro
223-
- ./rivet-client/rivet-actor.conflist:/opt/cni/config/rivet-actor.conflist:ro
224226
- client-data:/var/lib/rivet-client
225227
ports:
226228
# Enable host networking for actors

docker/dev-full/rivet-client/config.jsonc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,18 @@
22
"client": {
33
"runner": {
44
"flavor": "container",
5-
"use_resource_constraints": false
5+
// Resource constraints are not supported in Docker
6+
// TODO: Needs further investigation in to why nested cgroups v2 resource constraints aren't working
7+
"use_resource_constraints": false,
8+
"custom_hosts": [
9+
// Define host for the API server
10+
//
11+
// This is a custom IP defined in entrypoint.sh iptables
12+
{
13+
"ip": "192.168.100.1",
14+
"hostname": "rivet-server"
15+
}
16+
]
617
},
718
"cluster": {
819
// This is safe to hardcode

0 commit comments

Comments
 (0)