Merge pull request #265 from parca-dev/podman-login

.github: Fix container registry login
parca-dev · Mar 2, 2022 · 1110c48 · 1110c48
2 parents 3fd3aa2 + b469b53
commit 1110c48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -33,8 +33,8 @@ jobs:
       - name: Login to registry
         if: ${{ github.event_name != 'pull_request' }}
         run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | buildah login -u parca-dev --password-stdin ghcr.io
-          echo "${{ secrets.QUAY_PASSWORD }}" | buildah login -u "${{ secrets.QUAY_USERNAME }}" --password-stdin quay.io
+          echo "${{ secrets.GITHUB_TOKEN }}" | podman login -u parca-dev --password-stdin ghcr.io
+          echo "${{ secrets.QUAY_PASSWORD }}" | podman login -u "${{ secrets.QUAY_USERNAME }}" --password-stdin quay.io
 
       - name: Push container
         if: ${{ github.event_name != 'pull_request' }}

diff --git a/Makefile b/Makefile
@@ -209,11 +209,11 @@ container:
 
 .PHONY: push-container
 push-container:
-	podman push $(OUT_DOCKER):$(VERSION)
+	podman manifest push $(OUT_DOCKER):$(VERSION)
 
 .PHONY: push-quay-container
 push-quay-container:
-	podman push $(OUT_DOCKER):$(VERSION) quay.io/parca/parca-agent:$(VERSION)
+	podman manifest push $(OUT_DOCKER):$(VERSION) quay.io/parca/parca-agent:$(VERSION)
 
 .PHONY: internal/pprof
 internal/pprof: