diff --git a/common/go.mod b/common/go.mod index 50d8ce6..ec6a4eb 100644 --- a/common/go.mod +++ b/common/go.mod @@ -1,5 +1,5 @@ module github.com/ystv/streamer/common -go 1.21 +go 1.22 -toolchain go1.21.6 +toolchain go1.22.1 diff --git a/forwarder/Dockerfile b/forwarder/Dockerfile index 38f2dcf..820f9a2 100644 --- a/forwarder/Dockerfile +++ b/forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.7-alpine3.19 AS build +FROM golang:1.22.1-alpine3.19 AS build LABEL site="ystv-streamer-forwarder" diff --git a/forwarder/go.mod b/forwarder/go.mod index 90b7686..c515a6a 100644 --- a/forwarder/go.mod +++ b/forwarder/go.mod @@ -1,8 +1,8 @@ module github.com/ystv/streamer/forwarder -go 1.21 +go 1.22 -toolchain go1.21.7 +toolchain go1.22.1 require ( github.com/gorilla/websocket v1.5.1 @@ -11,7 +11,7 @@ require ( github.com/labstack/echo/v4 v4.11.4 github.com/mitchellh/mapstructure v1.5.0 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/ystv/streamer/common v0.0.0-20240214233956-8447f6611cb8 + github.com/ystv/streamer/common v0.0.0-20240304231557-758f738b0e1a ) require ( @@ -20,8 +20,8 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect ) diff --git a/forwarder/go.sum b/forwarder/go.sum index 5a6b532..442de37 100644 --- a/forwarder/go.sum +++ b/forwarder/go.sum @@ -27,16 +27,16 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/ystv/streamer/common v0.0.0-20240214233956-8447f6611cb8 h1:yIx6so3SrTTGhx//eFagLZ4V8J13rlfy9k9N35agh6c= -github.com/ystv/streamer/common v0.0.0-20240214233956-8447f6611cb8/go.mod h1:z6ngpeQPvzjqpPqWDwQsXE7rY4cEzhgQugL2P0OaKKw= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +github.com/ystv/streamer/common v0.0.0-20240304231557-758f738b0e1a h1:Bv+BU6kDeI/5IRIq7mmdE7HqzOq9w7zrl/HlVvlfY7g= +github.com/ystv/streamer/common v0.0.0-20240304231557-758f738b0e1a/go.mod h1:z6ngpeQPvzjqpPqWDwQsXE7rY4cEzhgQugL2P0OaKKw= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/go.mod b/go.mod index 6b8b20a..cf1e874 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ module github.com/ystv/streamer -go 1.21 +go 1.22 -toolchain go1.21.6 +toolchain go1.22.1 diff --git a/recorder/Dockerfile b/recorder/Dockerfile index eb6cb25..33f542c 100644 --- a/recorder/Dockerfile +++ b/recorder/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.7-alpine3.19 AS build +FROM golang:1.22.1-alpine3.19 AS build LABEL site="ystv-streamer-recorder" diff --git a/recorder/go.mod b/recorder/go.mod index 16d60c2..752d7a2 100644 --- a/recorder/go.mod +++ b/recorder/go.mod @@ -1,8 +1,8 @@ module github.com/ystv/streamer/recorder -go 1.21 +go 1.22 -toolchain go1.21.7 +toolchain go1.22.1 require ( github.com/gorilla/websocket v1.5.1 @@ -11,7 +11,7 @@ require ( github.com/labstack/echo/v4 v4.11.4 github.com/mitchellh/mapstructure v1.5.0 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/ystv/streamer/common v0.0.0-20240214233956-8447f6611cb8 + github.com/ystv/streamer/common v0.0.0-20240304231557-758f738b0e1a ) require ( @@ -20,8 +20,8 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect ) diff --git a/recorder/go.sum b/recorder/go.sum index 5a6b532..442de37 100644 --- a/recorder/go.sum +++ b/recorder/go.sum @@ -27,16 +27,16 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/ystv/streamer/common v0.0.0-20240214233956-8447f6611cb8 h1:yIx6so3SrTTGhx//eFagLZ4V8J13rlfy9k9N35agh6c= -github.com/ystv/streamer/common v0.0.0-20240214233956-8447f6611cb8/go.mod h1:z6ngpeQPvzjqpPqWDwQsXE7rY4cEzhgQugL2P0OaKKw= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +github.com/ystv/streamer/common v0.0.0-20240304231557-758f738b0e1a h1:Bv+BU6kDeI/5IRIq7mmdE7HqzOq9w7zrl/HlVvlfY7g= +github.com/ystv/streamer/common v0.0.0-20240304231557-758f738b0e1a/go.mod h1:z6ngpeQPvzjqpPqWDwQsXE7rY4cEzhgQugL2P0OaKKw= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/server/Dockerfile b/server/Dockerfile index 798a9fa..4edaf11 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.7-alpine3.19 AS build +FROM golang:1.22.1-alpine3.19 AS build LABEL stage="builder" diff --git a/server/go.mod b/server/go.mod index 3ce00ef..a840cdd 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,8 +1,8 @@ module github.com/ystv/streamer/server -go 1.21 +go 1.22 -toolchain go1.21.7 +toolchain go1.22.1 require ( github.com/google/uuid v1.6.0 @@ -13,7 +13,7 @@ require ( github.com/labstack/gommon v0.4.2 github.com/mitchellh/mapstructure v1.5.0 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/ystv/streamer/common v0.0.0-20240224110523-a1eadbeea663 + github.com/ystv/streamer/common v0.0.0-20240304231557-758f738b0e1a google.golang.org/protobuf v1.32.0 ) @@ -23,9 +23,9 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect ) diff --git a/server/go.sum b/server/go.sum index 7a6229e..e10f3dc 100644 --- a/server/go.sum +++ b/server/go.sum @@ -33,16 +33,16 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/ystv/streamer/common v0.0.0-20240224110523-a1eadbeea663 h1:rrQZ9AQoJ/3KE4v1R7lIo38g5EloM3teYsx4xuH+1oE= -github.com/ystv/streamer/common v0.0.0-20240224110523-a1eadbeea663/go.mod h1:z6ngpeQPvzjqpPqWDwQsXE7rY4cEzhgQugL2P0OaKKw= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +github.com/ystv/streamer/common v0.0.0-20240304231557-758f738b0e1a h1:Bv+BU6kDeI/5IRIq7mmdE7HqzOq9w7zrl/HlVvlfY7g= +github.com/ystv/streamer/common v0.0.0-20240304231557-758f738b0e1a/go.mod h1:z6ngpeQPvzjqpPqWDwQsXE7rY4cEzhgQugL2P0OaKKw= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=