fix: image name

Signed-off-by: ShutingZhao <[email protected]>
nirmata · Jul 25, 2023 · 568e508 · 568e508
1 parent 81c3881
commit 568e508
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/actions/publish-image/action.yaml b/.github/actions/publish-image/action.yaml
@@ -55,7 +55,7 @@ runs:
       run: |
         set -e
         make ${{ inputs.makefile-target }}
-        echo "digest=$(docker images | grep nirmata | awk 'NR==1{print $2}')" >> $GITHUB_OUTPUT
+        echo "digest=$(docker inspect --format='{{index .RepoDigests 0}}' ghcr.io/${{ github.repository }}:${{ github.sha }})" >> $GITHUB_OUTPUT
     - uses: CycloneDX/gh-gomod-generate-sbom@d4aee0cf5133055dbd98899978246c10c18c440f # v1.1.0
       with:
         version: v1

diff --git a/Makefile b/Makefile
@@ -103,12 +103,11 @@ docker-build:
 	@echo Build kyverno-notation-aws image with docker... >&2
 	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 LD_FLAGS=$(LD_FLAGS) go build -o kyverno-notation-aws .
 	docker buildx build --platform linux/arm64/v8 -t $(REPO_IMAGE):$(IMAGE_TAG_LATEST) --load .
-	docker tag $(REPO_IMAGE):$(IMAGE_TAG_LATEST) $(REPO_IMAGE):$(IMAGE_TAG_SHA)
 
 docker-publish:
 	@echo Build kyverno-notation-aws image with docker... >&2
 	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 LD_FLAGS=$(LD_FLAGS) go build -o kyverno-notation-aws .
 	docker buildx build --platform linux/arm64/v8 -t $(REPO_IMAGE):$(IMAGE_TAG_LATEST) --load .
 	docker tag $(REPO_IMAGE):$(IMAGE_TAG_LATEST) $(REPO_IMAGE):$(IMAGE_TAG_SHA)
-	docker push ghcr.io/nirmata/kyverno-notation-aws:$(IMAGE_TAG_SHA)
-	docker push ghcr.io/nirmata/kyverno-notation-aws:$(IMAGE_TAG_LATEST)
+	docker push $(REPO_IMAGE):$(IMAGE_TAG_SHA)
+	docker push $(REPO_IMAGE):$(IMAGE_TAG_LATEST)