Merge pull request #445 from weaveworks/revert-439-feature/quay-registry

Revert "Add quay.io as second registry"

.github/workflows/on-main-push.yaml

@@ -29,13 +29,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME_WEAVEWORKSKUREDCI }}
           password: ${{ secrets.DOCKERHUB_TOKEN_WEAVEWORKSKUREDCI }}
 
-      - name: Login to quay.io
-        uses: docker/login-action@v1
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAYIO_USERNAME_WEAVEWORKSKUREDCI }}
-          password: ${{ secrets.QUAYIO_TOKEN_WEAVEWORKSKUREDCI }}
-
       - name: Build image
         run: |
           make DH_ORG="${{ github.repository_owner }}" image

.github/workflows/on-tag.yaml

@@ -37,13 +37,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME_WEAVEWORKSKUREDCI }}
           password: ${{ secrets.DOCKERHUB_TOKEN_WEAVEWORKSKUREDCI }}
 
-      - name: Login to quay.io
-        uses: docker/login-action@v1
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAYIO_USERNAME_WEAVEWORKSKUREDCI }}
-          password: ${{ secrets.QUAYIO_TOKEN_WEAVEWORKSKUREDCI }}
-
       - name: Publish image
         run: |
           make DH_ORG="${{ github.repository_owner }}" VERSION="${{ steps.tags.outputs.version }}" publish-image

Makefile

@@ -24,14 +24,12 @@ build/.image.done: cmd/kured/Dockerfile cmd/kured/kured
 	cp $^ build
 	$(SUDO) docker build -t docker.io/$(DH_ORG)/kured -f build/Dockerfile ./build
 	$(SUDO) docker tag docker.io/$(DH_ORG)/kured docker.io/$(DH_ORG)/kured:$(VERSION)
-	$(SUDO) docker tag docker.io/$(DH_ORG)/kured quay.io/$(DH_ORG)/kured:$(VERSION)
 	touch $@
 
 image: build/.image.done
 
 publish-image: image
 	$(SUDO) docker push docker.io/$(DH_ORG)/kured:$(VERSION)
-	$(SUDO) docker push quay.io/$(DH_ORG)/kured:$(VERSION)
 
 minikube-publish: image
 	$(SUDO) docker save docker.io/$(DH_ORG)/kured | (eval $$(minikube docker-env) && docker load)