RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2024-12-14 18:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix generation of Docker images with buildx v0.10

Browse Source 
see
https://github.com/docker/buildx/issues/1509
https://github.com/moby/moby/issues/43126
https://github.com/docker/cli/pull/3990
This commit is contained in:
aler9 2023-02-13 17:43:38 +01:00
parent 9e9133931c
commit efa75a1e95
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/dockerhub.mk
View File

@ -7,10 +7,8 @@ endef
export DOCKERFILE_DOCKERHUB export DOCKERFILE_DOCKERHUB
define DOCKERFILE_DOCKERHUB_RPI_32 define DOCKERFILE_DOCKERHUB_RPI_32
FROM --platform=linux/amd64 $(RPI32_IMAGE) FROM $(RPI32_IMAGE) AS base
RUN ["cross-build-start"]
RUN apt update && apt install -y --no-install-recommends libcamera0 RUN apt update && apt install -y --no-install-recommends libcamera0
RUN ["cross-build-end"]
ARG BINARY ARG BINARY
ADD $$BINARY / ADD $$BINARY /
ENTRYPOINT [ "/rtsp-simple-server" ] ENTRYPOINT [ "/rtsp-simple-server" ]
@ -18,10 +16,8 @@ endef
export DOCKERFILE_DOCKERHUB_RPI_32 export DOCKERFILE_DOCKERHUB_RPI_32
define DOCKERFILE_DOCKERHUB_RPI_64 define DOCKERFILE_DOCKERHUB_RPI_64
FROM --platform=linux/amd64 $(RPI64_IMAGE) FROM $(RPI64_IMAGE)
RUN ["cross-build-start"]
RUN apt update && apt install -y --no-install-recommends libcamera0 RUN apt update && apt install -y --no-install-recommends libcamera0
RUN ["cross-build-end"]
ARG BINARY ARG BINARY
ADD $$BINARY / ADD $$BINARY /
ENTRYPOINT [ "/rtsp-simple-server" ] ENTRYPOINT [ "/rtsp-simple-server" ]
@ -39,6 +35,7 @@ dockerhub:
docker buildx create --name=builder --use docker buildx create --name=builder --use
echo "$$DOCKERFILE_DOCKERHUB" | docker buildx build . -f - \ echo "$$DOCKERFILE_DOCKERHUB" | docker buildx build . -f - \
--provenance=false \
--platform=linux/amd64 \ --platform=linux/amd64 \
--build-arg BINARY="$$(echo binaries/*linux_amd64.tar.gz)" \ --build-arg BINARY="$$(echo binaries/*linux_amd64.tar.gz)" \
-t aler9/rtsp-simple-server:$(VERSION)-amd64 \ -t aler9/rtsp-simple-server:$(VERSION)-amd64 \
@ -46,6 +43,7 @@ dockerhub:
--push --push
echo "$$DOCKERFILE_DOCKERHUB" | docker buildx build . -f - \ echo "$$DOCKERFILE_DOCKERHUB" | docker buildx build . -f - \
--provenance=false \
--platform=linux/arm/v6 \ --platform=linux/arm/v6 \
--build-arg BINARY="$$(echo binaries/*linux_armv6.tar.gz)" \ --build-arg BINARY="$$(echo binaries/*linux_armv6.tar.gz)" \
-t aler9/rtsp-simple-server:$(VERSION)-armv6 \ -t aler9/rtsp-simple-server:$(VERSION)-armv6 \
@ -53,6 +51,7 @@ dockerhub:
--push --push
echo "$$DOCKERFILE_DOCKERHUB_RPI_32" | docker buildx build . -f - \ echo "$$DOCKERFILE_DOCKERHUB_RPI_32" | docker buildx build . -f - \
--provenance=false \
--platform=linux/arm/v6 \ --platform=linux/arm/v6 \
--build-arg BINARY="$$(echo binaries/*linux_armv6.tar.gz)" \ --build-arg BINARY="$$(echo binaries/*linux_armv6.tar.gz)" \
-t aler9/rtsp-simple-server:$(VERSION)-armv6-rpi \ -t aler9/rtsp-simple-server:$(VERSION)-armv6-rpi \
@ -60,6 +59,7 @@ dockerhub:
--push --push
echo "$$DOCKERFILE_DOCKERHUB" | docker buildx build . -f - \ echo "$$DOCKERFILE_DOCKERHUB" | docker buildx build . -f - \
--provenance=false \
--platform=linux/arm/v7 \ --platform=linux/arm/v7 \
--build-arg BINARY="$$(echo binaries/*linux_armv7.tar.gz)" \ --build-arg BINARY="$$(echo binaries/*linux_armv7.tar.gz)" \
-t aler9/rtsp-simple-server:$(VERSION)-armv7 \ -t aler9/rtsp-simple-server:$(VERSION)-armv7 \
@ -67,6 +67,7 @@ dockerhub:
--push --push
echo "$$DOCKERFILE_DOCKERHUB_RPI_32" | docker buildx build . -f - \ echo "$$DOCKERFILE_DOCKERHUB_RPI_32" | docker buildx build . -f - \
--provenance=false \
--platform=linux/arm/v7 \ --platform=linux/arm/v7 \
--build-arg BINARY="$$(echo binaries/*linux_armv7.tar.gz)" \ --build-arg BINARY="$$(echo binaries/*linux_armv7.tar.gz)" \
-t aler9/rtsp-simple-server:$(VERSION)-armv7-rpi \ -t aler9/rtsp-simple-server:$(VERSION)-armv7-rpi \
@ -74,6 +75,7 @@ dockerhub:
--push --push
echo "$$DOCKERFILE_DOCKERHUB" | docker buildx build . -f - \ echo "$$DOCKERFILE_DOCKERHUB" | docker buildx build . -f - \
--provenance=false \
--platform=linux/arm64/v8 \ --platform=linux/arm64/v8 \
--build-arg BINARY="$$(echo binaries/*linux_arm64v8.tar.gz)" \ --build-arg BINARY="$$(echo binaries/*linux_arm64v8.tar.gz)" \
-t aler9/rtsp-simple-server:$(VERSION)-arm64v8 \ -t aler9/rtsp-simple-server:$(VERSION)-arm64v8 \
@ -81,6 +83,7 @@ dockerhub:
--push --push
echo "$$DOCKERFILE_DOCKERHUB_RPI_64" | docker buildx build . -f - \ echo "$$DOCKERFILE_DOCKERHUB_RPI_64" | docker buildx build . -f - \
--provenance=false \
--platform=linux/arm64/v8 \ --platform=linux/arm64/v8 \
--build-arg BINARY="$$(echo binaries/*linux_arm64v8.tar.gz)" \ --build-arg BINARY="$$(echo binaries/*linux_arm64v8.tar.gz)" \
-t aler9/rtsp-simple-server:$(VERSION)-arm64v8-rpi \ -t aler9/rtsp-simple-server:$(VERSION)-arm64v8-rpi \