diff --git a/build/mediamtx.Dockerfile b/build/mediamtx.Dockerfile deleted file mode 100644 index ef7a3ec..0000000 --- a/build/mediamtx.Dockerfile +++ /dev/null @@ -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"] diff --git a/internal/container/integration_test.go b/internal/container/integration_test.go index 3105c06..f03374d 100644 --- a/internal/container/integration_test.go +++ b/internal/container/integration_test.go @@ -39,7 +39,7 @@ func TestIntegrationClientStartStop(t *testing.T) { Name: containerName, ChanSize: 1, ContainerConfig: &typescontainer.Config{ - Image: "netfluxio/mediamtx-alpine:latest", + Image: "ghcr.io/rfwatson/mediamtx-alpine:latest", Labels: map[string]string{container.LabelComponent: component}, }, HostConfig: &typescontainer.HostConfig{ @@ -84,7 +84,7 @@ func TestIntegrationClientRemoveContainers(t *testing.T) { stateC, err1C := client.RunContainer(ctx, container.RunContainerParams{ ChanSize: 1, ContainerConfig: &typescontainer.Config{ - Image: "netfluxio/mediamtx-alpine:latest", + Image: "ghcr.io/rfwatson/mediamtx-alpine:latest", Labels: map[string]string{container.LabelComponent: component, "group": "test1"}, }, HostConfig: &typescontainer.HostConfig{NetworkMode: "default"}, @@ -95,7 +95,7 @@ func TestIntegrationClientRemoveContainers(t *testing.T) { stateC, err2C := client.RunContainer(ctx, container.RunContainerParams{ ChanSize: 1, ContainerConfig: &typescontainer.Config{ - Image: "netfluxio/mediamtx-alpine:latest", + Image: "ghcr.io/rfwatson/mediamtx-alpine:latest", Labels: map[string]string{container.LabelComponent: component, "group": "test1"}, }, HostConfig: &typescontainer.HostConfig{NetworkMode: "default"}, @@ -106,7 +106,7 @@ func TestIntegrationClientRemoveContainers(t *testing.T) { stateC, err3C := client.RunContainer(ctx, container.RunContainerParams{ ChanSize: 1, ContainerConfig: &typescontainer.Config{ - Image: "netfluxio/mediamtx-alpine:latest", + Image: "ghcr.io/rfwatson/mediamtx-alpine:latest", Labels: map[string]string{container.LabelComponent: component, "group": "test2"}, }, HostConfig: &typescontainer.HostConfig{NetworkMode: "default"}, diff --git a/internal/mediaserver/actor.go b/internal/mediaserver/actor.go index 4fc15b6..86e09df 100644 --- a/internal/mediaserver/actor.go +++ b/internal/mediaserver/actor.go @@ -27,14 +27,14 @@ import ( type StreamKey string const ( - defaultFetchIngressStateInterval = 5 * time.Second // default interval to fetch the state of the media server - defaultAPIPort = 9997 // default API 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 - imageNameMediaMTX = "netfluxio/mediamtx-alpine:latest" // image name for mediamtx - defaultStreamKey StreamKey = "live" // Default stream key. See [StreamKey]. - componentName = "mediaserver" // component name, mostly used for Docker labels - httpClientTimeout = time.Second // timeout for outgoing HTTP client requests + defaultFetchIngressStateInterval = 5 * time.Second // default interval to fetch the state of the media server + defaultAPIPort = 9997 // default API 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 + imageNameMediaMTX = "ghcr.io/rfwatson/mediamtx-alpine:latest" // image name for mediamtx + defaultStreamKey StreamKey = "live" // Default stream key. See [StreamKey]. + componentName = "mediaserver" // component name, mostly used for Docker labels + httpClientTimeout = time.Second // timeout for outgoing HTTP client requests ) // action is an action to be performed by the actor. diff --git a/mise/tasks/push_mediamtx_image b/mise/tasks/push_mediamtx_image deleted file mode 100755 index 9f72d71..0000000 --- a/mise/tasks/push_mediamtx_image +++ /dev/null @@ -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