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