Skip to content

feat: build, test, and publish multi-arch (amd64 + arm64) images #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjhenry merged 1 commit into from
Oct 20, 2026
+86 −47
Merged

feat: build, test, and publish multi-arch (amd64 + arm64) images #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 31 additions & 19 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ${{ matrix.runner }}
strategy:
matrix:
include:
- arch: amd64
runner: ubuntu-24.04
- arch: arm64
runner: ubuntu-24.04-arm
steps:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
Expand All @@ -28,39 +35,52 @@ jobs:
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
platforms: linux/${{ matrix.arch }}
push: false
tags: |
${{ steps.docker_meta_ci.outputs.tags }}
labels: ${{ steps.docker_meta_ci.outputs.labels }}
cache-from: type=registry,ref=solidnerd/bookstack-dev:master
cache-from: |
type=registry,ref=solidnerd/bookstack-dev:master
type=gha,scope=${{ matrix.arch }}
cache-to: type=gha,scope=${{ matrix.arch }},mode=max
outputs: type=docker,dest=/tmp/image-bookstack.tar

- name: Upload artifact
uses: actions/upload-artifact@v7
with:
name: image-bookstack-master
name: image-bookstack-${{ matrix.arch }}
path: /tmp/image-bookstack.tar
if-no-files-found: warn

e2e:
runs-on: ubuntu-latest
runs-on: ${{ matrix.runner }}
needs: build
strategy:
matrix:
include:
- arch: amd64
runner: ubuntu-24.04
- arch: arm64
runner: ubuntu-24.04-arm
steps:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7

- name: Download artifact
uses: actions/download-artifact@v8
with:
name: image-bookstack-master
name: image-bookstack-${{ matrix.arch }}
path: /tmp

- name: Load Docker image
run: |
docker load --input /tmp/image-bookstack.tar
docker image ls -a

- name: Execute End-to-End Test
run: make e2e

push:
runs-on: ubuntu-24.04
needs: e2e
Expand All @@ -80,17 +100,6 @@ jobs:
# Get "master" for master-branch changes
type=ref,event=branch

- name: Download artifact
uses: actions/download-artifact@v8
with:
name: image-bookstack-master
path: /tmp
if-no-files-found: warn
- name: Load Docker image
run: |
docker load --input /tmp/image-bookstack.tar
docker image ls -a

- name: Set up QEMU
uses: docker/setup-qemu-action@v4

Expand All @@ -116,12 +125,15 @@ jobs:
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: |
${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-from: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
cache-from: |
type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
type=gha,scope=amd64
type=gha,scope=arm64
cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}

- name: Update repo description
Expand Down
31 changes: 23 additions & 8 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ${{ matrix.runner }}
strategy:
matrix:
include:
- arch: amd64
runner: ubuntu-24.04
- arch: arm64
runner: ubuntu-24.04-arm
steps:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
Expand All @@ -28,35 +35,43 @@ jobs:
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
platforms: linux/${{ matrix.arch }}
push: ${{ github.event_name != 'pull_request' }}
tags: |
${{ steps.docker_meta_ci.outputs.tags }}
labels: ${{ steps.docker_meta_ci.outputs.labels }}
cache-from: type=registry,ref=solidnerd/bookstack-dev:master
cache-to: type=inline
cache-from: |
type=registry,ref=solidnerd/bookstack-dev:master
type=gha,scope=${{ matrix.arch }}
cache-to: type=gha,scope=${{ matrix.arch }},mode=max
outputs: type=docker,dest=/tmp/image-bookstack.tar

- name: Upload artifact
uses: actions/upload-artifact@v7
with:
name: image-bookstack
name: image-bookstack-${{ matrix.arch }}
path: /tmp/image-bookstack.tar
if-no-files-found: warn

e2e:
runs-on: ubuntu-latest
runs-on: ${{ matrix.runner }}
needs: build
strategy:
matrix:
include:
- arch: amd64
runner: ubuntu-24.04
- arch: arm64
runner: ubuntu-24.04-arm
steps:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7

- name: Download artifact
uses: actions/download-artifact@v8
with:
name: image-bookstack
name: image-bookstack-${{ matrix.arch }}
path: /tmp
if-no-files-found: warn

- name: Load Docker image
run: |
Expand Down
50 changes: 31 additions & 19 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ${{ matrix.runner }}
strategy:
matrix:
include:
- arch: amd64
runner: ubuntu-24.04
- arch: arm64
runner: ubuntu-24.04-arm
steps:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
Expand All @@ -28,38 +35,51 @@ jobs:
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
platforms: linux/${{ matrix.arch }}
push: false
tags: |
${{ steps.docker_meta_ci.outputs.tags }}
labels: ${{ steps.docker_meta_ci.outputs.labels }}
cache-from: type=registry,ref=solidnerd/bookstack-dev:master
cache-from: |
type=registry,ref=solidnerd/bookstack-dev:master
type=gha,scope=${{ matrix.arch }}
cache-to: type=gha,scope=${{ matrix.arch }},mode=max
outputs: type=docker,dest=/tmp/image-bookstack.tar

- name: Upload artifact
uses: actions/upload-artifact@v7
with:
name: image-bookstack-master
name: image-bookstack-${{ matrix.arch }}
path: /tmp/image-bookstack.tar

e2e:
runs-on: ubuntu-latest
runs-on: ${{ matrix.runner }}
needs: build
strategy:
matrix:
include:
- arch: amd64
runner: ubuntu-24.04
- arch: arm64
runner: ubuntu-24.04-arm
steps:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7

- name: Download artifact
uses: actions/download-artifact@v8
with:
name: image-bookstack-master
name: image-bookstack-${{ matrix.arch }}
path: /tmp

- name: Load Docker image
run: |
docker load --input /tmp/image-bookstack.tar
docker image ls -a

- name: Execute End-to-End Test
run: make e2e

push:
runs-on: ubuntu-24.04
needs: e2e
Expand All @@ -86,17 +106,6 @@ jobs:
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}.{{minor}}.{{patch}}

- name: Download artifact
uses: actions/download-artifact@v8
with:
name: image-bookstack-master
path: /tmp

- name: Load Docker image
run: |
docker load --input /tmp/image-bookstack.tar
docker image ls -a

- name: Set up QEMU
uses: docker/setup-qemu-action@v4

Expand All @@ -122,12 +131,15 @@ jobs:
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: |
${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-from: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
cache-from: |
type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
type=gha,scope=amd64
type=gha,scope=arm64
cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}

- name: Update repo description
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
sut:
image: appropriate/curl
image: curlimages/curl:8.23.0
command: ["--ipv4","--retry", "15","--retry-delay","5","--retry-connrefused","http://bookstack:8080/login"]
depends_on:
- bookstack
Expand Down