Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Build Images

on:
pull_request:
paths:
- images/**
- .github/workflows/build-images.yml

permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
prepare:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.generate.outputs.matrix }}
steps:
- name: Checkout
uses: actions/checkout@v6

- name: Generate matrix
id: generate
uses: docker/bake-action/subaction/matrix@v7
with:
workdir: images
target: default

images:
name: Build ${{ matrix.target }}
runs-on: ubuntu-latest
needs: prepare
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(needs.prepare.outputs.matrix) }}
steps:
- name: Checkout
uses: actions/checkout@v6

- name: Build Images
uses: docker/bake-action@v7
with:
source: images
targets: ${{ matrix.target }}
push: false
vars: PUSH=false
16 changes: 9 additions & 7 deletions .github/workflows/publish-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,19 @@ jobs:
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.images.outputs.matrix }}
targets: ${{ steps.images.outputs.targets }}
steps:
- name: Checkout
uses: actions/checkout@v6

- name: Generate image matrix
- name: Find publishable Bake targets
id: images
uses: docker/bake-action/subaction/matrix@v7
with:
workdir: images
target: default
working-directory: images
run: |
targets=$(docker buildx bake --print | jq -c '
[.target | to_entries[] | select(.value.tags | length > 0) | .key]
')
echo "targets=$targets" >> "$GITHUB_OUTPUT"

publish:
name: Publish ${{ matrix.target }}
Expand All @@ -46,7 +48,7 @@ jobs:
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(needs.prepare.outputs.matrix) }}
target: ${{ fromJSON(needs.prepare.outputs.targets) }}
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,6 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
prepare:
permissions:
contents: read
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.generate.outputs.matrix }}
steps:
- name: Checkout
uses: actions/checkout@v6
- name: Generate matrix
id: generate
uses: docker/bake-action/subaction/matrix@v7
with:
workdir: images
target: default
images:
name: Images
runs-on: ubuntu-latest
permissions:
contents: read
needs:
- prepare
strategy:
fail-fast: false
matrix:
include: ${{ fromJson(needs.prepare.outputs.matrix) }}
steps:
- name: Checkout
uses: actions/checkout@v6

- name: Build Images
uses: docker/bake-action@v7
with:
source: images
targets: ${{ matrix.target }}
push: false
vars: PUSH=false


publish:
name: Publish
runs-on: ubuntu-latest
Expand Down Expand Up @@ -97,7 +58,6 @@ jobs:
release:
name: Release
needs:
- images
- publish
runs-on: ubuntu-latest
permissions:
Expand Down
Loading