Merge pull request #815 from barakda/canceling_push_to_private_registry

removing push to private registry

Author: barakda

.github/workflows/build-container.yml

@@ -864,36 +864,6 @@ jobs:
           name: atom-artifact
           path: /tmp/artifact/*
 
-  push-images-to-private-registry:
-    if: github.event_name == 'push' && github.ref == 'refs/heads/devel' && github.repository == 'ceph/ceph-nvmeof'
-    needs: [pytest, demo, discovery, ha]
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Download container images
-        uses: actions/download-artifact@v4
-        with:
-          name: container_images_nvmeof
-
-      - name: Load container images
-        run: |
-          docker load < nvmeof.tar
-          docker load < nvmeof-cli.tar
-
-      - name: Login to quay.io
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ vars.CONTAINER_REGISTRY }}
-          username: '${{ vars.CONTAINER_PRIVATE_REGISTRY_USERNAME }}'
-          password: '${{ secrets.CONTAINER_PRIVATE_REGISTRY_PASSWORD }}'
-
-      - name: Publish nvmeof containers when release/tag is created
-        run: |
-          make push QUAY="${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_PRIVATE_REGISTRY_USERNAME }}"
-
   push-images-to-ceph-registry:
     if: github.event_name == 'release'
     needs: [pytest, demo, discovery, ha]

mk/containerized.mk

@@ -24,33 +24,18 @@ build: DOCKER_COMPOSE_ENV = DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1
 
 push: ## Push nvmeof and nvmeof-cli containers images to quay.io registries
 	@SHORT_VERSION=$(shell echo $(VERSION) | cut -d. -f1-2); \
-	if ! echo $(QUAY) | grep -q 'ceph'; then \
-		echo "NVMEoF images are about to be pushed to private registry"; \
-		docker tag $(QUAY_NVMEOF):$(VERSION) $(QUAY)/nvmeof:$(VERSION); \
-		docker tag $(QUAY)/nvmeof:$(VERSION) $(QUAY)/nvmeof:$$SHORT_VERSION; \
-		docker tag $(QUAY)/nvmeof:$(VERSION) $(QUAY)/nvmeof:latest; \
-		docker tag $(QUAY_NVMEOFCLI):$(VERSION) $(QUAY)/nvmeof-cli:$(VERSION); \
-		docker tag $(QUAY)/nvmeof-cli:$(VERSION) $(QUAY)/nvmeof-cli:$$SHORT_VERSION; \
-		docker tag $(QUAY)/nvmeof-cli:$(VERSION) $(QUAY)/nvmeof-cli:latest; \
-		docker push $(QUAY)/nvmeof:$(VERSION); \
-		docker push $(QUAY)/nvmeof:$$SHORT_VERSION; \
-		docker push $(QUAY)/nvmeof:latest; \
-		docker push $(QUAY)/nvmeof-cli:$(VERSION); \
-		docker push $(QUAY)/nvmeof-cli:$$SHORT_VERSION; \
-		docker push $(QUAY)/nvmeof-cli:latest; \
-	else \
-		echo "NVMEoF images are about to be pushed to ceph registry"; \
-		docker tag $(QUAY_NVMEOF):$(VERSION) $(QUAY_NVMEOF):$$SHORT_VERSION; \
-		docker tag $(QUAY_NVMEOF):$(VERSION) $(QUAY_NVMEOF):latest; \
-		docker tag $(QUAY_NVMEOFCLI):$(VERSION) $(QUAY_NVMEOFCLI):$$SHORT_VERSION; \
-		docker tag $(QUAY_NVMEOFCLI):$(VERSION) $(QUAY_NVMEOFCLI):latest; \
-		docker push $(QUAY_NVMEOF):$(VERSION); \
-		docker push $(QUAY_NVMEOF):$$SHORT_VERSION; \
-		docker push $(QUAY_NVMEOF):latest; \
-		docker push $(QUAY_NVMEOFCLI):$(VERSION); \
-		docker push $(QUAY_NVMEOFCLI):$$SHORT_VERSION; \
-		docker push $(QUAY_NVMEOFCLI):latest; \
-	fi
+	echo "NVMEoF images are about to be pushed to ceph registry"; \
+	docker tag $(QUAY_NVMEOF):$(VERSION) $(QUAY_NVMEOF):$$SHORT_VERSION; \
+	docker tag $(QUAY_NVMEOF):$(VERSION) $(QUAY_NVMEOF):latest; \
+	docker tag $(QUAY_NVMEOFCLI):$(VERSION) $(QUAY_NVMEOFCLI):$$SHORT_VERSION; \
+	docker tag $(QUAY_NVMEOFCLI):$(VERSION) $(QUAY_NVMEOFCLI):latest; \
+	docker push $(QUAY_NVMEOF):$(VERSION); \
+	docker push $(QUAY_NVMEOF):$$SHORT_VERSION; \
+	docker push $(QUAY_NVMEOF):latest; \
+	docker push $(QUAY_NVMEOFCLI):$(VERSION); \
+	docker push $(QUAY_NVMEOFCLI):$$SHORT_VERSION; \
+	docker push $(QUAY_NVMEOFCLI):latest; \
+
 
 run: ## Run command CMD inside SVC containers
 run: override OPTS += --rm