fix make dockerhub-legacy (#1924)

This commit is contained in:
Alessandro Ros 2023-06-07 13:48:10 +02:00 committed by GitHub
parent c9eb1a56aa
commit 73d3a81126
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 33 deletions

View File

@ -5,18 +5,30 @@ dockerhub-legacy:
docker login -u $(DOCKER_USER_LEGACY) -p $(DOCKER_PASSWORD_LEGACY)
docker pull $(DOCKER_REPOSITORY):$(VERSION)
docker tag $(DOCKER_REPOSITORY):$(VERSION) $(DOCKER_REPOSITORY_LEGACY):v$(VERSION)
docker push $(DOCKER_REPOSITORY_LEGACY):v$(VERSION)
docker run --rm \
-v $(HOME)/.docker:/.docker:ro \
quay.io/skopeo/stable:latest copy --all \
--authfile /.docker/config.json \
docker://docker.io/$(DOCKER_REPOSITORY):$(VERSION)-rpi \
docker://docker.io/$(DOCKER_REPOSITORY_LEGACY):v$(VERSION)-rpi
docker pull $(DOCKER_REPOSITORY):$(VERSION)-rpi
docker tag $(DOCKER_REPOSITORY):$(VERSION) $(DOCKER_REPOSITORY_LEGACY):v$(VERSION)-rpi
docker push $(DOCKER_REPOSITORY_LEGACY):v$(VERSION)-rpi
docker run --rm \
-v $(HOME)/.docker:/.docker:ro \
quay.io/skopeo/stable:latest copy --all \
--authfile /.docker/config.json \
docker://docker.io/$(DOCKER_REPOSITORY):latest-rpi \
docker://docker.io/$(DOCKER_REPOSITORY_LEGACY):latest-rpi
docker pull $(DOCKER_REPOSITORY):latest
docker tag $(DOCKER_REPOSITORY):$(VERSION) $(DOCKER_REPOSITORY_LEGACY):latest
docker push $(DOCKER_REPOSITORY_LEGACY):latest
docker run --rm \
-v $(HOME)/.docker:/.docker:ro \
quay.io/skopeo/stable:latest copy --all \
--authfile /.docker/config.json \
docker://docker.io/$(DOCKER_REPOSITORY):$(VERSION) \
docker://docker.io/$(DOCKER_REPOSITORY_LEGACY):v$(VERSION)
docker pull $(DOCKER_REPOSITORY):latest-rpi
docker tag $(DOCKER_REPOSITORY):$(VERSION) $(DOCKER_REPOSITORY_LEGACY):latest-rpi
docker push $(DOCKER_REPOSITORY_LEGACY):latest-rpi
docker run --rm \
-v $(HOME)/.docker:/.docker:ro \
quay.io/skopeo/stable:latest copy --all \
--authfile /.docker/config.json \
docker://docker.io/$(DOCKER_REPOSITORY):latest \
docker://docker.io/$(DOCKER_REPOSITORY_LEGACY):latest

View File

@ -64,20 +64,6 @@ dockerhub:
rm -rf $$HOME/.docker/manifests/*
docker buildx create --name=builder --use
echo "$$DOCKERFILE_DOCKERHUB" | docker buildx build . -f - \
--provenance=false \
--platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 \
-t $(DOCKER_REPOSITORY):$(VERSION) \
-t $(DOCKER_REPOSITORY):latest \
--push
echo "$$DOCKERFILE_DOCKERHUB_FFMPEG" | docker buildx build . -f - \
--provenance=false \
--platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 \
-t $(DOCKER_REPOSITORY):$(VERSION)-ffmpeg \
-t $(DOCKER_REPOSITORY):latest-ffmpeg \
--push
echo "$$DOCKERFILE_DOCKERHUB_RPI_BASE_32" | docker buildx build . -f - \
--provenance=false \
--platform=linux/arm/v6 \
@ -93,13 +79,6 @@ dockerhub:
--platform=linux/arm64/v8 \
--output type=tar,dest=tmp/rpi_base/linux/arm64.tar
echo "$$DOCKERFILE_DOCKERHUB_RPI" | docker buildx build . -f - \
--provenance=false \
--platform=linux/arm/v6,linux/arm/v7,linux/arm64/v8 \
-t $(DOCKER_REPOSITORY):$(VERSION)-rpi \
-t $(DOCKER_REPOSITORY):latest-rpi \
--push
echo "$$DOCKERFILE_DOCKERHUB_FFMPEG_RPI" | docker buildx build . -f - \
--provenance=false \
--platform=linux/arm/v6,linux/arm/v7,linux/arm64/v8 \
@ -107,5 +86,26 @@ dockerhub:
-t $(DOCKER_REPOSITORY):latest-ffmpeg-rpi \
--push
echo "$$DOCKERFILE_DOCKERHUB_RPI" | docker buildx build . -f - \
--provenance=false \
--platform=linux/arm/v6,linux/arm/v7,linux/arm64/v8 \
-t $(DOCKER_REPOSITORY):$(VERSION)-rpi \
-t $(DOCKER_REPOSITORY):latest-rpi \
--push
echo "$$DOCKERFILE_DOCKERHUB_FFMPEG" | docker buildx build . -f - \
--provenance=false \
--platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 \
-t $(DOCKER_REPOSITORY):$(VERSION)-ffmpeg \
-t $(DOCKER_REPOSITORY):latest-ffmpeg \
--push
echo "$$DOCKERFILE_DOCKERHUB" | docker buildx build . -f - \
--provenance=false \
--platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 \
-t $(DOCKER_REPOSITORY):$(VERSION) \
-t $(DOCKER_REPOSITORY):latest \
--push
docker buildx rm builder
rm -rf $$HOME/.docker/manifests/*