diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ac296cb..0650f834 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -137,18 +137,6 @@ jobs: DOCKER_USER: ${{ secrets.DOCKER_USER }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - dockerhub_legacy: - needs: dockerhub - runs-on: ubuntu-22.04 - - steps: - - uses: actions/checkout@v4 - - - run: make dockerhub-legacy - env: - DOCKER_USER_LEGACY: ${{ secrets.DOCKER_USER_LEGACY }} - DOCKER_PASSWORD_LEGACY: ${{ secrets.DOCKER_PASSWORD_LEGACY }} - api_docs: needs: binaries runs-on: ubuntu-22.04 diff --git a/Makefile b/Makefile index 907d3463..e1a0f87b 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ help: @echo " apidocs generate api docs HTML" @echo " binaries build binaries for all platforms" @echo " dockerhub build and push images to Docker Hub" - @echo " dockerhub-legacy build and push images to Docker Hub (legacy)" @echo "" blank := diff --git a/scripts/dockerhub-legacy.mk b/scripts/dockerhub-legacy.mk deleted file mode 100644 index 3cbc532b..00000000 --- a/scripts/dockerhub-legacy.mk +++ /dev/null @@ -1,34 +0,0 @@ -DOCKER_REPOSITORY_LEGACY = aler9/rtsp-simple-server - -dockerhub-legacy: - $(eval VERSION := $(shell git describe --tags | tr -d v)) - - docker login -u $(DOCKER_USER_LEGACY) -p $(DOCKER_PASSWORD_LEGACY) - - 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 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 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 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