diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 1c07db5..b080b17 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -87,5 +87,10 @@ jobs: tar -zxvf bin/m7s_linux_amd64.tar.gz mv m7s monibuca_linux docker login -u langhuihui -p ${{ secrets.DOCKER_PASSWORD }} - docker build -t langhuihui/monibuca:${{ env.version }} . + docker build -t langhuihui/monibuca:latest . + docker push langhuihui/monibuca:latest + - name: docker push + if: success() && !contains(env.version, 'beta') + run: | + docker tag langhuihui/monibuca:latest langhuihui/monibuca:${{ env.version }} docker push langhuihui/monibuca:${{ env.version }} \ No newline at end of file diff --git a/go.mod b/go.mod index 6264a18..40a39d2 100644 --- a/go.mod +++ b/go.mod @@ -4,20 +4,20 @@ go 1.20 require ( go.uber.org/zap v1.26.0 - m7s.live/engine/v4 v4.14.7-0.20240122075901-e82bc7e5d06f + m7s.live/engine/v4 v4.14.7-0.20240211022911-f320e61803b9 m7s.live/plugin/debug/v4 v4.0.3-0.20240124064804-dfa1a464eecc - m7s.live/plugin/fmp4/v4 v4.0.5 + m7s.live/plugin/fmp4/v4 v4.0.6-0.20240207073644-4ea6db4e7f52 m7s.live/plugin/gb28181/v4 v4.4.4 m7s.live/plugin/hdl/v4 v4.1.10 m7s.live/plugin/hls/v4 v4.3.8 m7s.live/plugin/hook/v4 v4.0.3 m7s.live/plugin/jessica/v4 v4.2.1 - m7s.live/plugin/logrotate/v4 v4.0.5 + m7s.live/plugin/logrotate/v4 v4.0.6-0.20240212132214-47665b96f71a m7s.live/plugin/monitor/v4 v4.0.5 m7s.live/plugin/preview/v4 v4.1.4 m7s.live/plugin/record/v4 v4.4.6 - m7s.live/plugin/room/v4 v4.0.12 - m7s.live/plugin/rtmp/v4 v4.2.11-0.20240119065647-2fc87b15dc71 + m7s.live/plugin/room/v4 v4.0.13-0.20240201093613-7e397d53b72b + m7s.live/plugin/rtmp/v4 v4.2.11-0.20240211012426-5f36b127f2a5 m7s.live/plugin/rtsp/v4 v4.3.4 m7s.live/plugin/snap/v4 v4.0.8 m7s.live/plugin/webrtc/v4 v4.2.4 @@ -106,4 +106,5 @@ require ( golang.org/x/tools v0.13.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect m7s.live/plugin/ps/v4 v4.1.5-0.20231213072312-25570d9571b3 // indirect + ) diff --git a/go.sum b/go.sum index 0d891e2..85e81dd 100644 --- a/go.sum +++ b/go.sum @@ -434,14 +434,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -m7s.live/engine/v4 v4.14.7-0.20240122075901-e82bc7e5d06f h1:EHJfih7/yel77SBJvYluzxT7XIQQHNhyBuOK3J50Hk0= -m7s.live/engine/v4 v4.14.7-0.20240122075901-e82bc7e5d06f/go.mod h1:FRtMPBGzNE6kCLgY0wuS3H7d1btKocRiVe9fAkDtP1g= -m7s.live/plugin/debug/v4 v4.0.2 h1:JWiECbI4V7s/5RIjAJR/TscS0Wae2Lv+sg/D8HVJZpU= -m7s.live/plugin/debug/v4 v4.0.2/go.mod h1:muzikl1KrHfbT/+2aHzKg9qDGfpArViQAtpcfFrST88= +m7s.live/engine/v4 v4.14.7-0.20240208144125-2891ee83926b h1:GMKO97s2q9UyZcHX3rfhJCvqThVNqeQr3+tJn2DUbgE= +m7s.live/engine/v4 v4.14.7-0.20240208144125-2891ee83926b/go.mod h1:FRtMPBGzNE6kCLgY0wuS3H7d1btKocRiVe9fAkDtP1g= +m7s.live/engine/v4 v4.14.7-0.20240211022911-f320e61803b9 h1:ZMv28KEKb3V9fUicarPMUPQDdqyHmCTEwBYM/kCHXyw= +m7s.live/engine/v4 v4.14.7-0.20240211022911-f320e61803b9/go.mod h1:FRtMPBGzNE6kCLgY0wuS3H7d1btKocRiVe9fAkDtP1g= m7s.live/plugin/debug/v4 v4.0.3-0.20240124064804-dfa1a464eecc h1:Mo1qVoc0qPZnTiVIpDlC67TY02u8YuAQeMTX2S1yIBA= m7s.live/plugin/debug/v4 v4.0.3-0.20240124064804-dfa1a464eecc/go.mod h1:muzikl1KrHfbT/+2aHzKg9qDGfpArViQAtpcfFrST88= -m7s.live/plugin/fmp4/v4 v4.0.5 h1:0madI/TKvrLkYVAKuPK1HBvbVf0RJg0g2WruET3S+9c= -m7s.live/plugin/fmp4/v4 v4.0.5/go.mod h1:4ShxA9Ud2LeYZ/xQaPTWEVfjpK844ijoXxLqhCA607A= +m7s.live/plugin/fmp4/v4 v4.0.6-0.20240207073644-4ea6db4e7f52 h1:okHAq1P/GGov+baT/YsUQYwbj69T8hgvxo1jlvuEfIE= +m7s.live/plugin/fmp4/v4 v4.0.6-0.20240207073644-4ea6db4e7f52/go.mod h1:0P3IbefEJ6Cs9AeMME0FbEiOK7XNn1fJ5xHohtefIQA= m7s.live/plugin/gb28181/v4 v4.4.4 h1:2ZeHCYk1qyYoF9YwEJPFkqZzH/FmkadSxT2GC+tkKFk= m7s.live/plugin/gb28181/v4 v4.4.4/go.mod h1:mK5embLQwDULFJjA7jBls1Cwvow98lTWS6n/uZ7Ampk= m7s.live/plugin/hdl/v4 v4.1.10 h1:6/3aCaVvqpc4m/oyhW1jgQeYfPHINiKGAP+FGptVNqU= @@ -454,6 +454,8 @@ m7s.live/plugin/jessica/v4 v4.2.1 h1:GbQ8V2ElHT7Q/0y1cyXCzw/DvTnqkpP1kCOpVd+0d6Y m7s.live/plugin/jessica/v4 v4.2.1/go.mod h1:62tI6vio/PkJhuIbkrIKZm9jAEHwkzXe4Uk1EJaK5iQ= m7s.live/plugin/logrotate/v4 v4.0.5 h1:5TK91rhqo3kJMUHu9C1CBkd/j8HeoUSG4okk5gRjq4Y= m7s.live/plugin/logrotate/v4 v4.0.5/go.mod h1:a8hIV59GjpQDE+Ip790CU7yOHaG4+Iweci0sLvo43FU= +m7s.live/plugin/logrotate/v4 v4.0.6-0.20240212132214-47665b96f71a h1:ciKIEEG71EZNtmQGZGIlYjVqHc9WkNxdLAHxfzqkrzI= +m7s.live/plugin/logrotate/v4 v4.0.6-0.20240212132214-47665b96f71a/go.mod h1:a8hIV59GjpQDE+Ip790CU7yOHaG4+Iweci0sLvo43FU= m7s.live/plugin/monitor/v4 v4.0.5 h1:NOoCBd8832H0BuTGvtuxGljSxFW3GIMM/gg+5xk8KcA= m7s.live/plugin/monitor/v4 v4.0.5/go.mod h1:rMERBOcTTTdsVh+rPLjxdM45aAjVSQ+I0kADvUol4J4= m7s.live/plugin/preview/v4 v4.1.4 h1:ij5X5AYyD3vTOpla8DfVIcQi62HNZTHMppTgr7fFEh4= @@ -462,10 +464,10 @@ m7s.live/plugin/ps/v4 v4.1.5-0.20231213072312-25570d9571b3 h1:Ibo6vCb8VpqnpIQ2/3 m7s.live/plugin/ps/v4 v4.1.5-0.20231213072312-25570d9571b3/go.mod h1:RAb507iNmPG43I5kUA6ewF1fTRHDRsKbIVkIdLdKeeI= m7s.live/plugin/record/v4 v4.4.6 h1:uXhJIudBQ8T3hsNkkOgEbtWsC8feiIT1o/+Ij1SWU0A= m7s.live/plugin/record/v4 v4.4.6/go.mod h1:4fSAA/AYCNsFA0Ii0UVuBqsbhoTXC1s3lC/en5qabjg= -m7s.live/plugin/room/v4 v4.0.12 h1:jT2Ovpd/tV9F+F3gUhwxqDunrCPfa90/kSXnqqCbiZ4= -m7s.live/plugin/room/v4 v4.0.12/go.mod h1:4GBdAHUYtdp+nkHcGIClI8xkIUo/VTrD9Y0YMlTE7HU= -m7s.live/plugin/rtmp/v4 v4.2.11-0.20240119065647-2fc87b15dc71 h1:uBnwgjIDT7qhcnS2f5L6psx/TGp6lLZbf7QZKME0iCM= -m7s.live/plugin/rtmp/v4 v4.2.11-0.20240119065647-2fc87b15dc71/go.mod h1:UqI1l1+3Y2zg2oOUkfVJ719hcv10bMYVAlg5e+gqy2E= +m7s.live/plugin/room/v4 v4.0.13-0.20240201093613-7e397d53b72b h1:33giws3MPXL8KSeUh9lpcuR0IwPtrmVJd7f+EqK2v44= +m7s.live/plugin/room/v4 v4.0.13-0.20240201093613-7e397d53b72b/go.mod h1:4GBdAHUYtdp+nkHcGIClI8xkIUo/VTrD9Y0YMlTE7HU= +m7s.live/plugin/rtmp/v4 v4.2.11-0.20240211012426-5f36b127f2a5 h1:0sUTv702OGf8eiJHhXMFDgNi7IaryIbC6lWDOSXRrzQ= +m7s.live/plugin/rtmp/v4 v4.2.11-0.20240211012426-5f36b127f2a5/go.mod h1:UqI1l1+3Y2zg2oOUkfVJ719hcv10bMYVAlg5e+gqy2E= m7s.live/plugin/rtsp/v4 v4.3.4 h1:dwRCdmXEFORzvVhPHfIV+5Pdlhx/OMjk5xmaKDpRDXw= m7s.live/plugin/rtsp/v4 v4.3.4/go.mod h1:s6tETQjq/peipACzpkPjXsZfHw+Vq7D1lyHnqSl8DRs= m7s.live/plugin/snap/v4 v4.0.8 h1:65t4Wd9wiBdD1/ucCSVma5/LhEg/6XbC4yqf95uvCxI=