From 37e222aa2e7da2e6c9c2e4e9d18c1a6a6a75994e Mon Sep 17 00:00:00 2001 From: CG Date: Sun, 3 Nov 2024 17:18:14 +0100 Subject: [PATCH] Switching to buildah action for pushing --- .github/workflows/build-image.yml | 13 +++++--- .github/workflows/push-image.yml | 52 ++++++++++++++++--------------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 4082c3a..d4a21a0 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -1,4 +1,4 @@ -name: Container image build +name: Buildah Build on: push: @@ -12,6 +12,7 @@ on: - master paths: - "Containerfile" + jobs: build: name: Build image @@ -20,10 +21,12 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: redhat-actions/buildah-build@v2 - name: Buildah action + # https://github.com/redhat-actions/buildah-build + - name: Buildah build + id: build-image + uses: redhat-actions/buildah-build@v2 with: - image: ${{ github.repository }} - tags: ${{ github.sha }} + image: mpv + tags: latest ${{ github.ref_name }} containerfiles: | ./Containerfile diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index 1505440..d2a4085 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -1,4 +1,4 @@ -name: Publish container image to Docker Hub +name: Buildah Build and Push on: push: @@ -6,29 +6,31 @@ on: - '*' jobs: - push_to_registry: - name: Push Container image to Docker Hub - runs-on: ubuntu-22.04 + build_n_push: + name: Build and push + runs-on: ubuntu-24.04 + steps: - - name: Check out the repo - uses: actions/checkout@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: cremuzzi/mpv + - uses: actions/checkout@v4 - - name: Build and push Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - with: - context: . - labels: ${{ steps.meta.outputs.labels }} - push: true - tags: ${{ steps.meta.outputs.tags }} + # https://github.com/redhat-actions/buildah-build + - name: Buildah build + id: build-image + uses: redhat-actions/buildah-build@v2 + with: + image: mpv + tags: latest ${{ github.ref_name }} + containerfiles: | + ./Containerfile + + # https://github.com/redhat-actions/push-to-registry + - name: Push To docker.io + id: push-to-docker-io + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.build-image.outputs.image }} + tags: ${{ steps.build-image.outputs.tags }} + registry: docker.io/cremuzzi + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} +