From 74719be8255cb32cf967dd0602804538d52ba25a Mon Sep 17 00:00:00 2001 From: Essem Date: Fri, 16 May 2025 18:42:53 -0500 Subject: [PATCH] ci: Add image builds without ImageMagick --- .github/workflows/docker-commit.yml | 11 +++++++++++ .github/workflows/docker-release.yml | 10 ++++++++++ .github/workflows/docker.yml | 7 ++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-commit.yml b/.github/workflows/docker-commit.yml index 9f6961fb..5e4fd35e 100644 --- a/.github/workflows/docker-commit.yml +++ b/.github/workflows/docker-commit.yml @@ -13,8 +13,19 @@ jobs: if: github.repository == 'esmBot/esmBot' uses: ./.github/workflows/docker.yml with: + imagemagick: true stable: false tags: | type=raw,value=edge type=sha secrets: inherit + + build-no-magick: + if: github.repository == 'esmBot/esmBot' + uses: ./.github/workflows/docker.yml + with: + stable: false + tags: | + type=raw,value=edge-no-magick + type=sha,suffix=-no-magick + secrets: inherit diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index ad948ae1..5a8ff5e4 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -13,7 +13,17 @@ jobs: build: uses: ./.github/workflows/docker.yml with: + imagemagick: true stable: true tags: | type=semver,pattern={{version}} secrets: inherit + + build-no-magick: + uses: ./.github/workflows/docker.yml + with: + stable: false + tags: | + type=raw,value=no-magick + type=semver,pattern={{version}},suffix=-no-magick + secrets: inherit diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d945e516..1b75b2d4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,6 +6,9 @@ on: stable: type: boolean default: false + imagemagick: + type: boolean + default: false tags: type: string @@ -22,7 +25,7 @@ jobs: key: linux/amd64 - os: ubuntu-24.04-arm key: linux/arm64 - name: Build and Publish Docker Image (${{matrix.platform.key}}) + name: Build and Publish Docker Image (${{matrix.platform.key}}) (${{ inputs.imagemagick && 'With' || 'Without' }} ImageMagick) runs-on: ${{matrix.platform.os}} steps: - uses: actions/checkout@v4 @@ -52,6 +55,8 @@ jobs: with: context: . push: true + build-args: | + MAGICK=${{ inputs.imagemagick && '1' || '0' }} platforms: ${{ matrix.platform.key }} labels: ${{ steps.meta.outputs.labels }} tags: ${{ env.REGISTRY_IMAGE }} -- 2.51.2