From 4c1ec680a902e36233f1a514f63e527b7d8db73f Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Fri, 14 Mar 2025 20:58:33 -0500 Subject: [PATCH] use buildah --- .gitea/workflows/release-image-gitea.yml | 28 +++++++++++++++-------- .gitea/workflows/release-image-harbor.yml | 28 +++++++++++++++-------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/release-image-gitea.yml b/.gitea/workflows/release-image-gitea.yml index 18d8c0e..3ab96fc 100644 --- a/.gitea/workflows/release-image-gitea.yml +++ b/.gitea/workflows/release-image-gitea.yml @@ -23,21 +23,29 @@ jobs: type=ref,event=tag images: ${{ vars.REPOSITORY_HOST }}/${{ gitea.repository }} - - name: Log into Container Registry - uses: docker/login-action@v3 + - name: Log into Registry + id: log-in + uses: redhat-actions/podman-login@v1 with: registry: ${{ vars.REPOSITORY_HOST }} username: ${{ gitea.actor }} password: ${{ secrets.REPOSITORY_TOKEN }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Build and Push Image - uses: docker/build-push-action@v6 + - name: Build Image + id: build-image + uses: redhat-actions/buildah-build@v2 with: - context: . - push: true + oci: true + image: ${{ vars.REPOSITORY_HOST }}/${{ gitea.repository }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - file: ./Dockerfile + containerfiles: | + ./Dockerfile + + - name: Push Image + id: push-to-gitea + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.build-image.outputs.image }} + tags: ${{ steps.build-image.outputs.tags }} + registry: ${{ vars.REPOSITORY_HOST }} diff --git a/.gitea/workflows/release-image-harbor.yml b/.gitea/workflows/release-image-harbor.yml index ce50be5..fe1e483 100644 --- a/.gitea/workflows/release-image-harbor.yml +++ b/.gitea/workflows/release-image-harbor.yml @@ -23,21 +23,29 @@ jobs: type=ref,event=tag images: ${{ vars.REGISTRY_HOST }}/images - - name: Log into Container Registry - uses: docker/login-action@v3 + - name: Log into Registry + id: log-in + uses: redhat-actions/podman-login@v1 with: registry: ${{ vars.REGISTRY_HOST }} username: ${{ vars.REGISTRY_USER }} password: ${{ secrets.REGISTRY_SECRET }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Build and Push Image - uses: docker/build-push-action@v6 + - name: Build Image + id: build-image + uses: redhat-actions/buildah-build@v2 with: - context: . - push: true + oci: true + image: ${{ vars.REGISTRY_HOST }}/images tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - file: ./Dockerfile + containerfiles: | + ./Dockerfile + + - name: Push Image + id: push-to-gitea + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.build-image.outputs.image }} + tags: ${{ steps.build-image.outputs.tags }} + registry: ${{ vars.REGISTRY_HOST }}