From fd59060633ab104da00494fcb27d28f70eff9ceb Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Mon, 28 Apr 2025 23:54:45 +0200 Subject: [PATCH] remove v8 suffix from arm64 binaries (#4472) --- docker/ffmpeg-rpi.Dockerfile | 2 +- docker/ffmpeg.Dockerfile | 2 +- docker/rpi.Dockerfile | 2 +- docker/standard.Dockerfile | 2 +- scripts/binaries.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/ffmpeg-rpi.Dockerfile b/docker/ffmpeg-rpi.Dockerfile index 67765c6a..b5619507 100644 --- a/docker/ffmpeg-rpi.Dockerfile +++ b/docker/ffmpeg-rpi.Dockerfile @@ -3,7 +3,7 @@ FROM --platform=linux/amd64 scratch AS binaries ADD binaries/mediamtx_*_linux_armv6.tar.gz /linux/arm/v6 ADD binaries/mediamtx_*_linux_armv7.tar.gz /linux/arm/v7 -ADD binaries/mediamtx_*_linux_arm64v8.tar.gz /linux/arm64 +ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64 ################################################################# diff --git a/docker/ffmpeg.Dockerfile b/docker/ffmpeg.Dockerfile index 515cf497..1b2f08fc 100644 --- a/docker/ffmpeg.Dockerfile +++ b/docker/ffmpeg.Dockerfile @@ -4,7 +4,7 @@ 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_arm64v8.tar.gz /linux/arm64 +ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64 ################################################################# FROM alpine:3.20 diff --git a/docker/rpi.Dockerfile b/docker/rpi.Dockerfile index 3ac4c91f..16c3736f 100644 --- a/docker/rpi.Dockerfile +++ b/docker/rpi.Dockerfile @@ -3,7 +3,7 @@ FROM --platform=linux/amd64 scratch AS binaries ADD binaries/mediamtx_*_linux_armv6.tar.gz /linux/arm/v6 ADD binaries/mediamtx_*_linux_armv7.tar.gz /linux/arm/v7 -ADD binaries/mediamtx_*_linux_arm64v8.tar.gz /linux/arm64 +ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64 ################################################################# diff --git a/docker/standard.Dockerfile b/docker/standard.Dockerfile index 6a6659ad..c5084704 100644 --- a/docker/standard.Dockerfile +++ b/docker/standard.Dockerfile @@ -4,7 +4,7 @@ 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_arm64v8.tar.gz /linux/arm64 +ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64 ################################################################# FROM scratch diff --git a/scripts/binaries.mk b/scripts/binaries.mk index 3d294f40..995cd62d 100644 --- a/scripts/binaries.mk +++ b/scripts/binaries.mk @@ -52,7 +52,7 @@ RUN tar -C tmp -czf "binaries/$(BINARY_NAME)_$$(cat internal/core/VERSION)_linux FROM build-base AS build-linux-arm64 ENV GOOS=linux GOARCH=arm64 RUN go build -o "tmp/$(BINARY_NAME)" -RUN tar -C tmp -czf "binaries/$(BINARY_NAME)_$$(cat internal/core/VERSION)_linux_arm64v8.tar.gz" --owner=0 --group=0 "$(BINARY_NAME)" mediamtx.yml LICENSE +RUN tar -C tmp -czf "binaries/$(BINARY_NAME)_$$(cat internal/core/VERSION)_linux_arm64.tar.gz" --owner=0 --group=0 "$(BINARY_NAME)" mediamtx.yml LICENSE FROM $(BASE_IMAGE) COPY --from=build-windows-amd64 /s/binaries /s/binaries