diff --git a/Makefile b/Makefile index 6957b14c..b6020716 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -BASE_IMAGE = golang:1.14-alpine3.12 +BASE_IMAGE = golang:1.15-alpine3.12 .PHONY: $(shell ls) diff --git a/README.md b/README.md index 2c9f9d1e..f0d3a5dc 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Download and launch the image: docker run --rm -it --network=host aler9/rtsp-simple-server ``` -The `--network=host` argument is mandatory since Docker can change the source port of UDP packets for routing reasons, and this makes RTSP routing impossible. This option can be avoided by disabling UDP and exposing the RTSP port: +The `--network=host` argument is mandatory since Docker can change the source port of UDP packets for routing reasons, and this makes RTSP routing impossible. This issue can be avoided by disabling UDP and exposing the RTSP port: ``` docker run --rm -it -e RTSP_PROTOCOLS=tcp -p 8554:8554 aler9/rtsp-simple-server ``` @@ -214,7 +214,7 @@ There are multiple ways to monitor the server usage over time: ``` means that there are 2 clients, 1 publisher and 1 reader. -* A metrics exporter, compatible with Prometheus, can be enabled with the option `metrics: yes`; then the server can be queried for metrics with Prometheus or with a simple HTTP request: +* A metrics exporter, compatible with Prometheus, can be enabled with the parameter `metrics: yes`; then the server can be queried for metrics with Prometheus or with a simple HTTP request: ``` wget -qO- localhost:9998 ``` @@ -238,11 +238,11 @@ There are multiple ways to monitor the server usage over time: * `rtsp_sources{type="rtmp",state="idle"}` is the count of rtmp sources that are not running * `rtsp_sources{type="rtmp",state="running"}` is the count of rtmp sources that are running -* A performance monitor, compatible with pprof, can be enabled with the option `pprof: yes`; then the server can be queried for metrics with pprof-compatible tools, like: +* A performance monitor, compatible with pprof, can be enabled with the parameter `pprof: yes`; then the server can be queried for metrics with pprof-compatible tools, like: ``` - docker run --rm -it --network=host golang:1.14 go tool pprof -text http://localhost:9999/debug/pprof/goroutine - docker run --rm -it --network=host golang:1.14 go tool pprof -text http://localhost:9999/debug/pprof/heap - docker run --rm -it --network=host golang:1.14 go tool pprof -text http://localhost:9999/debug/pprof/profile?seconds=30 + docker run --rm -it --network=host golang:1.15 go tool pprof -text http://localhost:9999/debug/pprof/goroutine + docker run --rm -it --network=host golang:1.15 go tool pprof -text http://localhost:9999/debug/pprof/heap + docker run --rm -it --network=host golang:1.15 go tool pprof -text http://localhost:9999/debug/pprof/profile?seconds=30 ``` ### Full command-line usage @@ -264,7 +264,7 @@ Args: ### Compile and run from source -Install Go ≥ 1.14, download the repository, open a terminal in it and run: +Install Go ≥ 1.15, download the repository, open a terminal in it and run: ``` go run . ``` diff --git a/go.mod b/go.mod index 0d5772d3..06653270 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aler9/rtsp-simple-server -go 1.14 +go 1.15 require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect diff --git a/stress/proxy/Dockerfile b/stress/proxy/Dockerfile index 2d6db954..99991422 100644 --- a/stress/proxy/Dockerfile +++ b/stress/proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14-alpine3.12 +FROM golang:1.15-alpine3.12 RUN apk add --no-cache \ ffmpeg diff --git a/stress/publish/Dockerfile b/stress/publish/Dockerfile index 8d288c03..91cfcc41 100644 --- a/stress/publish/Dockerfile +++ b/stress/publish/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14-alpine3.12 +FROM golang:1.15-alpine3.12 RUN apk add --no-cache \ ffmpeg diff --git a/stress/read/Dockerfile b/stress/read/Dockerfile index 88475534..1e8264f1 100644 --- a/stress/read/Dockerfile +++ b/stress/read/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14-alpine3.12 +FROM golang:1.15-alpine3.12 RUN apk add --no-cache \ ffmpeg