rob/octoplex
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(mediaserver): update MediaMTX image
Some checks failed
ci-build / lint (push) Has been cancelled
Details
ci-build / build (push) Has been cancelled
Details
ci-build / release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Rob Watson 2025-04-06 09:25:50 +02:00
parent 5735b2d73a
commit 3523a1a34e
4 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/mediamtx.Dockerfile
View File

@ -1,11 +0,0 @@
FROM bluenviron/mediamtx:latest AS mediamtx
FROM alpine:3.21
RUN apk add --no-cache \
bash \
curl
COPY --from=mediamtx /mediamtx /usr/bin/mediamtx
CMD ["/usr/bin/mediamtx"]

8
internal/container/integration_test.go
View File

@ -39,7 +39,7 @@ func TestIntegrationClientStartStop(t *testing.T) {
Name: containerName, Name: containerName,
ChanSize: 1, ChanSize: 1,
ContainerConfig: &typescontainer.Config{ ContainerConfig: &typescontainer.Config{
Image: "netfluxio/mediamtx-alpine:latest", Image: "ghcr.io/rfwatson/mediamtx-alpine:latest",
Labels: map[string]string{container.LabelComponent: component}, Labels: map[string]string{container.LabelComponent: component},
}, },
HostConfig: &typescontainer.HostConfig{ HostConfig: &typescontainer.HostConfig{
@ -84,7 +84,7 @@ func TestIntegrationClientRemoveContainers(t *testing.T) {
stateC, err1C := client.RunContainer(ctx, container.RunContainerParams{ stateC, err1C := client.RunContainer(ctx, container.RunContainerParams{
ChanSize: 1, ChanSize: 1,
ContainerConfig: &typescontainer.Config{ ContainerConfig: &typescontainer.Config{
Image: "netfluxio/mediamtx-alpine:latest", Image: "ghcr.io/rfwatson/mediamtx-alpine:latest",
Labels: map[string]string{container.LabelComponent: component, "group": "test1"}, Labels: map[string]string{container.LabelComponent: component, "group": "test1"},
}, },
HostConfig: &typescontainer.HostConfig{NetworkMode: "default"}, HostConfig: &typescontainer.HostConfig{NetworkMode: "default"},
@ -95,7 +95,7 @@ func TestIntegrationClientRemoveContainers(t *testing.T) {
stateC, err2C := client.RunContainer(ctx, container.RunContainerParams{ stateC, err2C := client.RunContainer(ctx, container.RunContainerParams{
ChanSize: 1, ChanSize: 1,
ContainerConfig: &typescontainer.Config{ ContainerConfig: &typescontainer.Config{
Image: "netfluxio/mediamtx-alpine:latest", Image: "ghcr.io/rfwatson/mediamtx-alpine:latest",
Labels: map[string]string{container.LabelComponent: component, "group": "test1"}, Labels: map[string]string{container.LabelComponent: component, "group": "test1"},
}, },
HostConfig: &typescontainer.HostConfig{NetworkMode: "default"}, HostConfig: &typescontainer.HostConfig{NetworkMode: "default"},
@ -106,7 +106,7 @@ func TestIntegrationClientRemoveContainers(t *testing.T) {
stateC, err3C := client.RunContainer(ctx, container.RunContainerParams{ stateC, err3C := client.RunContainer(ctx, container.RunContainerParams{
ChanSize: 1, ChanSize: 1,
ContainerConfig: &typescontainer.Config{ ContainerConfig: &typescontainer.Config{
Image: "netfluxio/mediamtx-alpine:latest", Image: "ghcr.io/rfwatson/mediamtx-alpine:latest",
Labels: map[string]string{container.LabelComponent: component, "group": "test2"}, Labels: map[string]string{container.LabelComponent: component, "group": "test2"},
}, },
HostConfig: &typescontainer.HostConfig{NetworkMode: "default"}, HostConfig: &typescontainer.HostConfig{NetworkMode: "default"},

16
internal/mediaserver/actor.go
View File

@ -27,14 +27,14 @@ import (
type StreamKey string type StreamKey string
const ( const (
defaultFetchIngressStateInterval = 5 * time.Second // default interval to fetch the state of the media server defaultFetchIngressStateInterval = 5 * time.Second // default interval to fetch the state of the media server
defaultAPIPort = 9997 // default API host port for the media server defaultAPIPort = 9997 // default API host port for the media server
defaultRTMPPort = 1935 // default RTMP host port for the media server defaultRTMPPort = 1935 // default RTMP host port for the media server
defaultChanSize = 64 // default channel size for asynchronous non-error channels defaultChanSize = 64 // default channel size for asynchronous non-error channels
imageNameMediaMTX = "netfluxio/mediamtx-alpine:latest" // image name for mediamtx imageNameMediaMTX = "ghcr.io/rfwatson/mediamtx-alpine:latest" // image name for mediamtx
defaultStreamKey StreamKey = "live" // Default stream key. See [StreamKey]. defaultStreamKey StreamKey = "live" // Default stream key. See [StreamKey].
componentName = "mediaserver" // component name, mostly used for Docker labels componentName = "mediaserver" // component name, mostly used for Docker labels
httpClientTimeout = time.Second // timeout for outgoing HTTP client requests httpClientTimeout = time.Second // timeout for outgoing HTTP client requests
) )
// action is an action to be performed by the actor. // action is an action to be performed by the actor.

7
mise/tasks/push_mediamtx_image
View File

@ -1,7 +0,0 @@
#!/usr/bin/env bash
#MISE description="Build and push mediamtx image"
set -euo pipefail
docker build -f build/mediamtx.Dockerfile -t netfluxio/mediamtx-alpine:latest .
docker push netfluxio/mediamtx-alpine:latest