From d76c6b561aff9976b0032efc3c64d3dac6fc234e Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Tue, 31 Mar 2026 22:34:46 +0200 Subject: [PATCH] modernize make dockerhub (#5628) --- scripts/dockerhub.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/dockerhub.mk b/scripts/dockerhub.mk index 307186ce..18b65817 100644 --- a/scripts/dockerhub.mk +++ b/scripts/dockerhub.mk @@ -5,10 +5,7 @@ dockerhub: docker login -u $(DOCKER_USER) -p $(DOCKER_PASSWORD) - docker buildx rm builder 2>/dev/null || true - docker buildx create --name=builder - - docker build --builder=builder \ + docker buildx build \ -f docker/ffmpeg-rpi.Dockerfile . \ --platform=linux/arm/v6,linux/arm/v7,linux/arm64 \ -t $(DOCKER_REPOSITORY):$(VERSION)-ffmpeg-rpi \ @@ -16,7 +13,7 @@ dockerhub: -t $(DOCKER_REPOSITORY):latest-ffmpeg-rpi \ --push - docker build --builder=builder \ + docker buildx build \ -f docker/rpi.Dockerfile . \ --platform=linux/arm/v6,linux/arm/v7,linux/arm64 \ -t $(DOCKER_REPOSITORY):$(VERSION)-rpi \ @@ -24,7 +21,7 @@ dockerhub: -t $(DOCKER_REPOSITORY):latest-rpi \ --push - docker build --builder=builder \ + docker buildx build \ -f docker/ffmpeg.Dockerfile . \ --platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 \ -t $(DOCKER_REPOSITORY):$(VERSION)-ffmpeg \ @@ -32,12 +29,10 @@ dockerhub: -t $(DOCKER_REPOSITORY):latest-ffmpeg \ --push - docker build --builder=builder \ + docker buildx build \ -f docker/standard.Dockerfile . \ --platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 \ -t $(DOCKER_REPOSITORY):$(VERSION) \ -t $(DOCKER_REPOSITORY):1 \ -t $(DOCKER_REPOSITORY):latest \ --push - - docker buildx rm builder