diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c26c112..8fe18f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,18 +2,18 @@ name: Maven PR Build
# We require all commits go through PR on GitHub
on:
- pull_request:
+ push:
branches:
- - main
+ - SERV-1012
jobs:
build:
name: Maven PR Builder (JDK ${{ matrix.java }} with ${{ matrix.build_property }})
- runs-on: ubuntu-latest
+ runs-on: macos-14
strategy:
matrix:
java: [ 11, 17 ]
- build_property: [ "kakadu.version", "ignored.version" ]
+ build_property: ["ignored.version"]
steps:
- name: Check out code
diff --git a/README.md b/README.md
index 7217deb..536e687 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,10 @@ To apply your own patches to the Cantaloupe source, create patchfiles with a Git
Patching an older version of Cantaloupe is possible as well.
+To use Docker buildkit (builx), supply the list of architectures to build:
+
+ mvn verify -Ddocker.platforms=linux/amd64,linux/arm64
+
_Hint: If you want to run a build without a Docker cache, add `-Ddocker.noCache` to your mvn command; for instance: `mvn verify -Ddocker.noCache`_
### Run the Cantaloupe container
diff --git a/pom.xml b/pom.xml
index 5cbf7c7..718d872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,6 +119,7 @@
remove
cantaloupe${artifact.qualifier}
true
+
@@ -403,6 +404,12 @@
${docker.image}
${project.basedir}/src/main/docker/Dockerfile
+
+
+
+ ${docker.platforms}
+
+