diff --git a/.github/workflows/nightly_binaries.yml b/.github/workflows/nightly_binaries.yml deleted file mode 100644 index d63640c14e3..00000000000 --- a/.github/workflows/nightly_binaries.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: nightly_binaries - -on: - workflow_dispatch: - -jobs: - nightly_binaries: - runs-on: ubuntu-22.04 - - steps: - - uses: actions/checkout@v6 - with: - fetch-depth: 0 - - - run: make binaries - - - uses: actions/upload-artifact@v7 - with: - name: binaries - path: binaries diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f3d7d7b26bb..dc91354cff5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,53 +95,6 @@ jobs: }); } - github_notify_issues: - needs: github_release - runs-on: ubuntu-22.04 - - steps: - - uses: actions/github-script@v8 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const { repo: { owner, repo } } = context; - - const tags = await github.rest.repos.listTags({ - owner, - repo, - }); - - const curTag = tags.data[0]; - const prevTag = tags.data[1]; - - const diff = await github.rest.repos.compareCommitsWithBasehead({ - owner, - repo, - basehead: `${prevTag.commit.sha}...${curTag.commit.sha}`, - }); - - const issues = {}; - - for (const commit of diff.data.commits) { - for (const match of commit.commit.message.matchAll(/(^| |\()#([0-9]+)( |\)|$)/g)) { - issues[match[2]] = 1; - } - } - - for (const issue in issues) { - try { - await github.rest.issues.createComment({ - owner, - repo, - issue_number: parseInt(issue), - body: `This issue is mentioned in release ${curTag.name} 🚀\n` - + `Check out the entire changelog by [clicking here](https://github.com/${owner}/${repo}/releases/tag/${curTag.name})`, - }); - } catch (exc) { - console.error(exc.toString()); - } - } - dockerhub: needs: binaries runs-on: ubuntu-22.04 @@ -156,5 +109,5 @@ jobs: - run: make dockerhub env: - DOCKER_USER: ${{ secrets.DOCKER_USER }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/docker/trixie.Dockerfile b/docker/trixie.Dockerfile new file mode 100644 index 00000000000..20c78814c1e --- /dev/null +++ b/docker/trixie.Dockerfile @@ -0,0 +1,21 @@ +################################################################# +FROM --platform=linux/amd64 scratch AS binaries + +ADD binaries/mediamtx_*_linux_amd64.tar.gz /linux/amd64 +ADD binaries/mediamtx_*_linux_armv6.tar.gz /linux/arm/v6 +ADD binaries/mediamtx_*_linux_armv7.tar.gz /linux/arm/v7 +ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64 + +################################################################# +FROM debian:trixie-slim + +# Keep the image small while ensuring TLS certificates are available. +RUN apt-get update \ + && apt-get install -y --no-install-recommends ca-certificates curl \ + && rm -rf /var/lib/apt/lists/* + +ARG TARGETPLATFORM +COPY --from=binaries /$TARGETPLATFORM / + +ENTRYPOINT [ "/mediamtx" ] + diff --git a/scripts/dockerhub.mk b/scripts/dockerhub.mk index 307186cea07..1de561b471f 100644 --- a/scripts/dockerhub.mk +++ b/scripts/dockerhub.mk @@ -1,4 +1,4 @@ -DOCKER_REPOSITORY = bluenviron/mediamtx +DOCKER_REPOSITORY = effectiverange/mediamtx dockerhub: $(eval VERSION := $(shell git describe --tags | tr -d v)) @@ -9,35 +9,11 @@ dockerhub: docker buildx create --name=builder docker build --builder=builder \ - -f docker/ffmpeg-rpi.Dockerfile . \ - --platform=linux/arm/v6,linux/arm/v7,linux/arm64 \ - -t $(DOCKER_REPOSITORY):$(VERSION)-ffmpeg-rpi \ - -t $(DOCKER_REPOSITORY):1-ffmpeg-rpi \ - -t $(DOCKER_REPOSITORY):latest-ffmpeg-rpi \ - --push - - docker build --builder=builder \ - -f docker/rpi.Dockerfile . \ - --platform=linux/arm/v6,linux/arm/v7,linux/arm64 \ - -t $(DOCKER_REPOSITORY):$(VERSION)-rpi \ - -t $(DOCKER_REPOSITORY):1-rpi \ - -t $(DOCKER_REPOSITORY):latest-rpi \ - --push - - docker build --builder=builder \ - -f docker/ffmpeg.Dockerfile . \ - --platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 \ - -t $(DOCKER_REPOSITORY):$(VERSION)-ffmpeg \ - -t $(DOCKER_REPOSITORY):1-ffmpeg \ - -t $(DOCKER_REPOSITORY):latest-ffmpeg \ - --push - - docker build --builder=builder \ - -f docker/standard.Dockerfile . \ + -f docker/trixie.Dockerfile . \ --platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 \ - -t $(DOCKER_REPOSITORY):$(VERSION) \ - -t $(DOCKER_REPOSITORY):1 \ - -t $(DOCKER_REPOSITORY):latest \ + -t $(DOCKER_REPOSITORY):$(VERSION)-trixie \ + -t $(DOCKER_REPOSITORY):1-trixie \ + -t $(DOCKER_REPOSITORY):latest-trixie \ --push docker buildx rm builder