Skip to content

Commit 5addbed

Browse files
authored
Revert "modernize make dockerhub (#5628)" (#5630)
This reverts commit d76c6b5.
1 parent 489a69a commit 5addbed

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

scripts/dockerhub.mk

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,39 @@ dockerhub:
55

66
docker login -u $(DOCKER_USER) -p $(DOCKER_PASSWORD)
77

8-
docker buildx build \
8+
docker buildx rm builder 2>/dev/null || true
9+
docker buildx create --name=builder
10+
11+
docker build --builder=builder \
912
-f docker/ffmpeg-rpi.Dockerfile . \
1013
--platform=linux/arm/v6,linux/arm/v7,linux/arm64 \
1114
-t $(DOCKER_REPOSITORY):$(VERSION)-ffmpeg-rpi \
1215
-t $(DOCKER_REPOSITORY):1-ffmpeg-rpi \
1316
-t $(DOCKER_REPOSITORY):latest-ffmpeg-rpi \
1417
--push
1518

16-
docker buildx build \
19+
docker build --builder=builder \
1720
-f docker/rpi.Dockerfile . \
1821
--platform=linux/arm/v6,linux/arm/v7,linux/arm64 \
1922
-t $(DOCKER_REPOSITORY):$(VERSION)-rpi \
2023
-t $(DOCKER_REPOSITORY):1-rpi \
2124
-t $(DOCKER_REPOSITORY):latest-rpi \
2225
--push
2326

24-
docker buildx build \
27+
docker build --builder=builder \
2528
-f docker/ffmpeg.Dockerfile . \
2629
--platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 \
2730
-t $(DOCKER_REPOSITORY):$(VERSION)-ffmpeg \
2831
-t $(DOCKER_REPOSITORY):1-ffmpeg \
2932
-t $(DOCKER_REPOSITORY):latest-ffmpeg \
3033
--push
3134

32-
docker buildx build \
35+
docker build --builder=builder \
3336
-f docker/standard.Dockerfile . \
3437
--platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 \
3538
-t $(DOCKER_REPOSITORY):$(VERSION) \
3639
-t $(DOCKER_REPOSITORY):1 \
3740
-t $(DOCKER_REPOSITORY):latest \
3841
--push
42+
43+
docker buildx rm builder

0 commit comments

Comments
 (0)