Update build scripts, CI workflow, and Docker configurations

.github/workflows/ci.yml

@@ -26,10 +26,10 @@ jobs:
     strategy:
       max-parallel: 3
       matrix:
-        jdk: [ 17.0.12_7, 21.0.4_7, 22.0.2_9 ]
+        jdk: [ 17.0.13_11, 21.0.5_11, 22.0.2_9 ]
         android: [ 34, 35 ]
-        ndk: [ 26.3.11579264, 27.0.12077973 ]
-        cmake: [ 3.22.1 ]
+        ndk: [ 26.3.11579264, 27.2.12479018 ]
+        cmake: [ 3.31.1 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -72,7 +72,8 @@ jobs:
             android=${{ matrix.android }}
             ndk=${{ matrix.ndk }}
             cmake=${{ matrix.cmake }}
-          provenance: true
+          provenance: ${{ github.event_name != 'pull_request' }}
+          sbom: ${{ github.event_name != 'pull_request' }}
           cache-from: type=registry,ref=user/app:latest
           cache-to: type=inline
       - name: Update Docker Hub repository description

Dockerfile

@@ -7,20 +7,21 @@
 #
 # Build with custom arguments:
 #
-#   $ ./scripts/build --android 34 --jdk 22.0.1_8 --ndk 25.2.9519653 --cmake 3.22.1
+#   $ ./scripts/build --android 35 --jdk 22.0.2_9 --ndk 25.2.9519653 --cmake 3.31.1
 #
 
 ARG jdk=22.0.2_9
 ARG android=35
 
 FROM saschpe/android-sdk:${android}-jdk${jdk}
 ARG android
-ARG cmake=3.22.1
+ARG cmake=3.31.1
 ARG jdk
-ARG ndk=27.0.12077973
+ARG ndk=27.2.12479018
 LABEL maintainer="Sascha Peilicke <sascha@peilicke.de"
 LABEL description="Android NDK ${ndk} with CMake ${cmake} on SDK ${android} using JDK ${jdk}"
 
+USER nonroot
 ENV NDK_ROOT="${ANDROID_SDK_ROOT}/ndk/${ndk}"
 RUN sdkmanager --install \
     "cmake;${cmake}" \

README.md

@@ -21,9 +21,10 @@ available:
 | 34 | ✅  | ✅  | ✅  | ✅  |
 | 35 |    | ✅  | ✅  | ✅  |
 
-* Android 35 image NDK versions: __26.2.11394342__ and __27.0.12077973__
-* Older Android image NDK versions: __25.2.9519653__ and __26.2.11394342__
-* CMake version: __3.22.1__
+* Android 35 image NDK versions: __26.2.11394342__ and __27.2.12479018__
+  * Previous images: __25.2.9519653__ and __26.2.11394342__
+* CMake version: __3.31.1__
+  * Previous images: __3.22.1__
 
 ## Usage
 

scripts/build

@@ -23,6 +23,7 @@ usage() {
   printf "  --ndk VERSION       (default: %s)\n" "${DEFAULT_NDK}"
   printf "  --platforms         (default: %s)\n" "${DEFAULT_PLATFORMS}"
   printf "  --push              (optional, upload images to Docker Hub)\n"
+  printf "  --verbose           (optional)\n"
   exit 1
 }
 
@@ -33,6 +34,7 @@ jdk="${DEFAULT_JDK}"
 ndk="${DEFAULT_NDK}"
 platforms="${DEFAULT_PLATFORMS}"
 cmd_push=
+docker_progress=auto
 while [ $# -gt 0 ]; do
   key="$1"
   case $key in
@@ -59,6 +61,9 @@ while [ $# -gt 0 ]; do
   --push)
     cmd_push=true
     ;;
+  --verbose)
+    docker_progress=plain
+    ;;
   -h | --help)
     usage
     shift # past argument
@@ -90,5 +95,6 @@ safe docker build \
   --build-arg cmake="${cmake}" \
   --build-arg jdk="${jdk}" \
   --build-arg ndk="${ndk}" \
+  --progress "${docker_progress}" \
   --tag "${image_tag}" \
   .