fix: change release.yml for repo changes

neuvector · Dec 5, 2024 · 900c32b · 900c32b
1 parent 23a01d7
commit 900c32b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,16 +33,25 @@ jobs:
     - name: Publish manifest
       uses: rancher/ecm-distro-tools/actions/publish-image@master
       with:
-        image: manager
+        image: neuvector-manager
         tag: ${{ github.ref_name }}
         platforms: linux/amd64,linux/arm64
 
         public-registry: docker.io
-        public-repo: neuvector
+        public-repo: rancher
         public-username: ${{ env.DOCKER_USERNAME }}
         public-password: ${{ env.DOCKER_PASSWORD }}
 
         prime-registry: ${{ env.PRIME_REGISTRY }}
         prime-repo: rancher
         prime-username: ${{ env.PRIME_REGISTRY_USERNAME }}
         prime-password: ${{ env.PRIME_REGISTRY_PASSWORD }}
+    - name: Login to registry
+      uses: docker/login-action@v3
+      with:
+        registry: docker.io
+        username: ${{ secrets.NV_DOCKER_USERNAME }}
+        password: ${{ secrets.NV_DOCKER_PASSWORD }}
+    - name: Publish neuvector
+      run: |
+        docker buildx imagetools create --tag docker.io/neuvector/manager:${{ github.ref_name }} docker.io/rancher/neuvector-manager:${{ github.ref_name }}
diff --git a/Makefile b/Makefile
@@ -95,5 +95,5 @@ build-image: buildx-machine ## build (and load) the container image targeting th
 push-image: buildx-machine
 	$(IMAGE_BUILDER) build -f package/Dockerfile \
 		--builder $(MACHINE) $(IMAGE_ARGS) $(IID_FILE_FLAG) $(BUILDX_ARGS) \
-		--build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) --platform=$(TARGET_PLATFORMS) -t "$(REPO)/manager:$(TAG)" --push .
+		--build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) --platform=$(TARGET_PLATFORMS) -t "$(REPO)/neuvector-manager:$(TAG)" --push .
 	@echo "Pushed $(IMAGE)"