From 82d27f687e18680a2ed4e3c4938503bddfbbdf59 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Wed, 2 Oct 2024 03:54:40 +0200 Subject: [PATCH] ci: add Deocker build argument --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa2a1bc..9242f3d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,8 +2,6 @@ name: Build on: push: branches: ['develop'] -env: - BUILDKIT_IMAGE: jkaninda/pg-bkup jobs: docker: runs-on: ubuntu-latest @@ -27,6 +25,8 @@ jobs: push: true file: "./docker/Dockerfile" platforms: linux/amd64,linux/arm64,linux/arm/v7 + build-args: | + appVersion=develop-${{ github.sha }} tags: | - "${{env.BUILDKIT_IMAGE}}:develop-${{ github.sha }}" + "${{vars.BUILDKIT_IMAGE}}:develop-${{ github.sha }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7cd0313..cb417ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,8 +3,6 @@ on: push: tags: - v1.** -env: - BUILDKIT_IMAGE: jkaninda/pg-bkup jobs: docker: runs-on: ubuntu-latest @@ -41,9 +39,11 @@ jobs: push: true file: "./docker/Dockerfile" platforms: linux/amd64,linux/arm64,linux/arm/v7 + build-args: | + appVersion=${{ env.TAG_NAME }} tags: | - "${{env.BUILDKIT_IMAGE}}:${{ env.TAG_NAME }}" - "${{env.BUILDKIT_IMAGE}}:latest" - "ghcr.io/${{env.BUILDKIT_IMAGE}}:${{ env.TAG_NAME }}" - "ghcr.io/${{env.BUILDKIT_IMAGE}}:latest" + "${{vars.BUILDKIT_IMAGE}}:${{ env.TAG_NAME }}" + "${{vars.BUILDKIT_IMAGE}}:latest" + "ghcr.io/${{vars.BUILDKIT_IMAGE}}:${{ env.TAG_NAME }}" + "ghcr.io/${{vars.BUILDKIT_IMAGE}}:latest"