Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions .github/workflows/nightly_binaries.yml

This file was deleted.

51 changes: 2 additions & 49 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
21 changes: 21 additions & 0 deletions docker/trixie.Dockerfile
Original file line number Diff line number Diff line change
@@ -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" ]

34 changes: 5 additions & 29 deletions scripts/dockerhub.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DOCKER_REPOSITORY = bluenviron/mediamtx
DOCKER_REPOSITORY = effectiverange/mediamtx

dockerhub:
$(eval VERSION := $(shell git describe --tags | tr -d v))
Expand All @@ -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