diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8ebeb2f..686e7e49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,7 +154,6 @@ jobs: if: startsWith(github.ref, 'refs/tags/') run: | echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - echo "${{ secrets.HSDP_DOCKER_REGISTRY_PASSWD }}" | docker login ${{ secrets.HSDP_DOCKER_REGISTRY }} -u ${{ secrets.HSDP_DOCKER_REGISTRY_USER }} --password-stdin echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - name: Release ${{ (!startsWith(github.ref, 'refs/tags/') && 'snapshot') || '' }} @@ -176,7 +175,6 @@ jobs: if: ${{ always() }} run: | docker logout - docker logout ${{ secrets.HSDP_DOCKER_REGISTRY }} docker logout ghcr.io provenance: diff --git a/.goreleaser.yml b/.goreleaser.yml index bad47540..7170cc0a 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -46,10 +46,6 @@ dockers: - "philipssoftware/{{ .ProjectName }}:v{{ .Major }}" - "philipssoftware/{{ .ProjectName }}:v{{ .Major }}.{{ .Minor }}" - "philipssoftware/{{ .ProjectName }}:latest" - - "docker.eu1.hsdp.io/dctna/{{ .ProjectName }}:{{ .Tag }}" - - "docker.eu1.hsdp.io/dctna/{{ .ProjectName }}:v{{ .Major }}" - - "docker.eu1.hsdp.io/dctna/{{ .ProjectName }}:v{{ .Major }}.{{ .Minor }}" - - "docker.eu1.hsdp.io/dctna/{{ .ProjectName }}:latest" - "ghcr.io/philips-labs/{{ .ProjectName }}:{{ .Tag }}" - "ghcr.io/philips-labs/{{ .ProjectName }}:v{{ .Major }}" - "ghcr.io/philips-labs/{{ .ProjectName }}:v{{ .Major }}.{{ .Minor }}" diff --git a/Makefile b/Makefile index d30524cc..83102277 100644 --- a/Makefile +++ b/Makefile @@ -166,10 +166,6 @@ docker-publish-web: ## publishes the image to the hsdp registry docker tag philipssoftware/dctna-web:latest philipssoftware/dctna-web:$(VERSION) docker tag philipssoftware/dctna-web:latest philipssoftware/dctna-web:$(MAJOR).$(MINOR) docker tag philipssoftware/dctna-web:latest philipssoftware/dctna-web:$(MAJOR) - docker tag philipssoftware/dctna-web:latest docker.eu1.hsdp.io/dctna/dctna-web:latest - docker tag philipssoftware/dctna-web:latest docker.eu1.hsdp.io/dctna/dctna-web:$(VERSION) - docker tag philipssoftware/dctna-web:latest docker.eu1.hsdp.io/dctna/dctna-web:$(MAJOR).$(MINOR) - docker tag philipssoftware/dctna-web:latest docker.eu1.hsdp.io/dctna/dctna-web:$(MAJOR) docker tag philipssoftware/dctna-web:latest ghcr.io/philips-labs/dctna-web:latest docker tag philipssoftware/dctna-web:latest ghcr.io/philips-labs/dctna-web:$(VERSION) docker tag philipssoftware/dctna-web:latest ghcr.io/philips-labs/dctna-web:$(MAJOR).$(MINOR) @@ -178,10 +174,6 @@ docker-publish-web: ## publishes the image to the hsdp registry docker push philipssoftware/dctna-web:$(VERSION) docker push philipssoftware/dctna-web:$(MAJOR).$(MINOR) docker push philipssoftware/dctna-web:$(MAJOR) - docker push docker.eu1.hsdp.io/dctna/dctna-web:latest - docker push docker.eu1.hsdp.io/dctna/dctna-web:$(VERSION) - docker push docker.eu1.hsdp.io/dctna/dctna-web:$(MAJOR).$(MINOR) - docker push docker.eu1.hsdp.io/dctna/dctna-web:$(MAJOR) docker push ghcr.io/philips-labs/dctna-web:latest docker push ghcr.io/philips-labs/dctna-web:$(VERSION) docker push ghcr.io/philips-labs/dctna-web:$(MAJOR).$(MINOR)