Fixed docker-compose.

ionorg · Jun 20, 2021 · e99cfea · e99cfea
1 parent 3e0a090
commit e99cfea
Show file tree

Hide file tree

Showing 14 changed files with 386 additions and 29 deletions.
diff --git a/configs/docker/biz.toml b/configs/docker/biz.toml
@@ -10,13 +10,6 @@ level = "info"
 [nats]
 url = "nats://nats:4222"
 
-[signal.grpc]
-#listen ip port
-host = "0.0.0.0"
-port = "5551"
-allow_all_origins = true
-# cert= "configs/certs/cert.pem"
-# key= "configs/certs/key.pem"
-
-[avp]
-elements = ["webmsaver"]
+[node]
+# node id
+nid = "biz01"
diff --git a/configs/docker/islb.toml b/configs/docker/islb.toml
@@ -9,7 +9,11 @@ level = "info"
 [nats]
 url = "nats://nats:4222"
 
+[node]
+# node id
+nid = "islb01"
+
 [redis]
 addrs = ["redis:6379"]
 password = ""
-db = 0
+db = 0
diff --git a/configs/docker/sfu.toml b/configs/docker/sfu.toml
@@ -6,6 +6,10 @@ dc = "dc1"
 [nats]
 url = "nats://nats:4222"
 
+[node]
+# node id
+nid = "sfu01"
+
 [sfu]
 # Ballast size in MiB, will allocate memory to reduce the GC trigger upto 2x the
 # size of ballast. Be aware that the ballast should be less than the half of memory
@@ -43,9 +47,12 @@ bestqualityfirst = true
 enabletemporallayer = false
 
 [webrtc]
+# Single port, portrange will not work if you enable this
+singleport = 5000
+
 # Range of ports that ion accepts WebRTC traffic on
 # Format: [min, max]   and max - min >= 100
-portrange = [15000, 15200]
+# portrange = [5000, 5200]
 # if sfu behind nat, set iceserver
 # [[webrtc.iceserver]]
 # urls = ["stun:stun.stunprotocol.org:3478"]
@@ -72,8 +79,16 @@ mdns = true
 # Multiple public IP addresses can be specified as a comma separated list
 # if the sfu is deployed in a DMZ between two 1-1 NAT for internal and
 # external users.
-nat1to1 = ["127.0.0.1"]
-icelite = true
+# nat1to1 = ["1.2.3.4"]
+# icelite = true
+
+[webrtc.timeouts]
+# The duration in [sec] without network activity before a ICE Agent is considered disconnected
+disconnected = 5
+# The duration in [sec] without network activity before a ICE Agent is considered failed after disconnected
+failed = 25
+# How often in [sec] the ICE Agent sends extra traffic if there is no activity, if media is flowing no traffic will be sent
+keepalive = 2
 
 [turn]
 # Enables embeded turn server
@@ -98,5 +113,4 @@ credentials = "pion=ion,pion2=ion2"
 
 [log]
 # 0 - INFO 1 - DEBUG 2 - TRACE
-v = 1
-level = "info"
+v = 1
diff --git a/configs/docker/sig.toml b/configs/docker/sig.toml
@@ -0,0 +1,31 @@
+[global]
+pprof = ":6064"
+# data center id
+dc = "dc1"
+
+[log]
+level = "info"
+# level = "debug"
+
+[nats]
+url = "nats://nats:4222"
+
+[node]
+# node id
+nid = "sig01"
+
+[signal.grpc]
+#listen ip port
+host = "0.0.0.0"
+port = "5551"
+allow_all_origins = true
+# cert= "configs/certs/cert.pem"
+# key= "configs/certs/key.pem"
+
+[signal.jwt]
+enabled = false 
+key_type = "HMAC"  # this selects the Signing method https://godoc.org/github.com/dgrijalva/jwt-go#SigningMethod
+key = "1q2dGu5pzikcrECJgW3ADfXX3EsmoD99SYvSVCpDsJrAqxou5tUNbHPvkEFI4bTS"
+
+[signal.svc]
+services = ["sfu","biz","avp"]
diff --git a/configs/sfu.toml b/configs/sfu.toml
@@ -47,9 +47,12 @@ bestqualityfirst = true
 enabletemporallayer = false
 
 [webrtc]
+# Single port, portrange will not work if you enable this
+singleport = 5000
+
 # Range of ports that ion accepts WebRTC traffic on
 # Format: [min, max]   and max - min >= 100
-portrange = [10000, 50000]
+#portrange = [5000, 5200]
 # if sfu behind nat, set iceserver
 # [[webrtc.iceserver]]
 # urls = ["stun:stun.stunprotocol.org:3478"]
@@ -79,6 +82,14 @@ mdns = true
 # nat1to1 = ["1.2.3.4"]
 # icelite = true
 
+[webrtc.timeouts]
+# The duration in [sec] without network activity before a ICE Agent is considered disconnected
+disconnected = 5
+# The duration in [sec] without network activity before a ICE Agent is considered failed after disconnected
+failed = 25
+# How often in [sec] the ICE Agent sends extra traffic if there is no activity, if media is flowing no traffic will be sent
+keepalive = 2
+
 [turn]
 # Enables embeded turn server
 enabled = false
@@ -102,5 +113,4 @@ credentials = "pion=ion,pion2=ion2"
 
 [log]
 # 0 - INFO 1 - DEBUG 2 - TRACE
-v = 1
-level = "info"
+v = 1
diff --git a/configs/sig.toml b/configs/sig.toml
@@ -1,5 +1,5 @@
 [global]
-pprof = ":6060"
+pprof = ":6064"
 # data center id
 dc = "dc1"
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     volumes:
       - "./configs/docker/sfu.toml:/configs/sfu.toml"
     ports:
-      - "15000-15200:15000-15200/udp"
+      - "5000:5000/udp"
       - 3478:3478
     depends_on:
       - nats
@@ -44,15 +44,28 @@ services:
     networks:
       - ionnet
 
+  sig:
+    image: pionwebrtc/ion:latest-sig
+    build:
+      dockerfile: ./docker/sig.Dockerfile
+      context: .
+    volumes:
+      - "./configs/docker/sig.toml:/configs/sig.toml"
+    ports:
+      - 5551:5551
+    depends_on:
+      - islb
+      - biz
+    networks:
+      - ionnet
+
   biz:
     image: pionwebrtc/ion:latest-biz
     build:
       dockerfile: ./docker/biz.Dockerfile
       context: .
     volumes:
       - "./configs/docker/biz.toml:/configs/biz.toml"
-    ports:
-      - 5551:5551
     depends_on:
       - nats
       - islb

diff --git a/docker/avp.Dockerfile b/docker/avp.Dockerfile
@@ -9,6 +9,7 @@ RUN cd $GOPATH/src/github.com/pion/ion && go mod download
 
 COPY pkg/ $GOPATH/src/github.com/pion/ion/pkg
 COPY cmd/ $GOPATH/src/github.com/pion/ion/cmd
+COPY proto/ $GOPATH/src/github.com/pion/ion/proto
 
 WORKDIR $GOPATH/src/github.com/pion/ion/cmd/avp
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /avp .

diff --git a/docker/biz.Dockerfile b/docker/biz.Dockerfile
@@ -8,9 +8,10 @@ COPY go.mod go.sum ./
 RUN cd $GOPATH/src/github.com/pion/ion && go mod download
 
 COPY pkg/ $GOPATH/src/github.com/pion/ion/pkg
-COPY cmd/ $GOPATH/src/github.com/pion/ion/cmd
+COPY proto/ $GOPATH/src/github.com/pion/ion/proto
+COPY apps/ $GOPATH/src/github.com/pion/ion/apps
 
-WORKDIR $GOPATH/src/github.com/pion/ion/cmd/biz
+WORKDIR $GOPATH/src/github.com/pion/ion/apps/biz
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /biz .
 
 FROM alpine:3.12.1

diff --git a/docker/islb.Dockerfile b/docker/islb.Dockerfile
@@ -9,6 +9,7 @@ RUN cd $GOPATH/src/github.com/pion/ion && go mod download
 
 COPY pkg/ $GOPATH/src/github.com/pion/ion/pkg
 COPY cmd/ $GOPATH/src/github.com/pion/ion/cmd
+COPY proto/ $GOPATH/src/github.com/pion/ion/proto
 
 WORKDIR $GOPATH/src/github.com/pion/ion/cmd/islb
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /islb .

diff --git a/docker/sfu.Dockerfile b/docker/sfu.Dockerfile
@@ -9,6 +9,7 @@ RUN cd $GOPATH/src/github.com/pion/ion && go mod download
 
 COPY pkg/ $GOPATH/src/github.com/pion/ion/pkg
 COPY cmd/ $GOPATH/src/github.com/pion/ion/cmd
+COPY proto/ $GOPATH/src/github.com/pion/ion/proto
 
 WORKDIR $GOPATH/src/github.com/pion/ion/cmd/sfu
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /sfu .

diff --git a/docker/sig.Dockerfile b/docker/sig.Dockerfile
@@ -0,0 +1,25 @@
+FROM golang:1.14.13-stretch
+
+ENV GO111MODULE=on
+
+WORKDIR $GOPATH/src/github.com/pion/ion
+
+COPY go.mod go.sum ./
+RUN cd $GOPATH/src/github.com/pion/ion && go mod download
+
+COPY pkg/ $GOPATH/src/github.com/pion/ion/pkg
+COPY cmd/ $GOPATH/src/github.com/pion/ion/cmd
+COPY proto/ $GOPATH/src/github.com/pion/ion/proto
+
+WORKDIR $GOPATH/src/github.com/pion/ion/cmd/signal
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /sig .
+
+FROM alpine:3.12.1
+
+RUN apk --no-cache add ca-certificates
+COPY --from=0 /sig /usr/local/bin/sig
+
+COPY configs/docker/sig.toml /configs/sig.toml
+
+ENTRYPOINT ["/usr/local/bin/sig"]
+CMD ["-c", "/configs/sig.toml"]
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/nats-io/nats.go v1.10.0
 	github.com/pion/ion-avp v1.8.4
 	github.com/pion/ion-log v1.2.0
-	github.com/pion/ion-sfu v1.9.9
+	github.com/pion/ion-sfu v1.10.6
 	github.com/pion/webrtc/v3 v3.0.29
 	github.com/pixelbender/go-sdp v1.1.0
 	github.com/soheilhy/cmux v0.1.4