Update

* Added VanillaIceCream (API 35) * Added arm64 architecture (#10)
alvr · Aug 4, 2024 · c08875e · c08875e
1 parent e91f271
commit c08875e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 28 deletions.
diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
@@ -92,13 +92,14 @@ jobs:
           password: ${{ secrets.QUAY_PASS }}
 
       - name: Build Android Base JDK${{ matrix.jdk }}
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./docker
           file: ./docker/base.Dockerfile
           push: ${{ startsWith(github.ref, 'refs/tags/v') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
           build-args: |
             JDK_VERSION=${{ matrix.jdk }}
             CMDLINE_VERSION=${{ env.CMDLINE_VERSION }}
@@ -110,7 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        android-api: [28, 29, 30, 31, 32, 33, 34, VanillaIceCream]
+        android-api: [28, 29, 30, 31, 32, 33, 34, 35]
         jdk: [8, 11, 17, 21]
 
     steps:
@@ -130,7 +131,7 @@ jobs:
               32) BUILD_TOOLS_VERSION="32.0.0" ;;
               33) BUILD_TOOLS_VERSION="33.0.2" ;;
               34) BUILD_TOOLS_VERSION="34.0.0" ;;
-              VanillaIceCream) BUILD_TOOLS_VERSION="35.0.0-rc3" ;;
+              35) BUILD_TOOLS_VERSION="35.0.0" ;;
           esac
           echo "BUILD_TOOLS_VERSION=$BUILD_TOOLS_VERSION" >> $GITHUB_ENV
 
@@ -173,13 +174,14 @@ jobs:
           password: ${{ secrets.QUAY_PASS }}
 
       - name: Build Android API ${{ matrix.android-api }} JDK${{ matrix.jdk }}
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./docker
           file: ./docker/android.Dockerfile
           push: ${{ startsWith(github.ref, 'refs/tags/v') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
           build-args: |
             JDK_VERSION=${{ matrix.jdk }}
             BUILD_TOOLS=${{ env.BUILD_TOOLS_VERSION }}

diff --git a/README.md b/README.md
@@ -33,10 +33,10 @@
 
 There are three variants of the image, all based on `bellsoft/liberica-openjdk-alpine`:
 
-* JDK8 images are based on Liberica JDK 8u392-9 and uses the tag's suffix `-jdk8`.
-* JDK11 images are based on Liberica JDK 11.0.21-10 and uses the tag's suffix `-jdk11`.
-* JDK17 images are based on Liberica JDK 17.0.9-11 and uses the tag's suffix `-jdk17`.
-* JDK21 images are based on Liberica JDK 21.0.1+15 and uses the tag's suffix `-jdk21`.
+* JDK8 images are based on Liberica JDK 8u422-6 and uses the tag's suffix `-jdk8`.
+* JDK11 images are based on Liberica JDK 11.0.24-9 and uses the tag's suffix `-jdk11`.
+* JDK17 images are based on Liberica JDK 17.0.12-10 and uses the tag's suffix `-jdk17`.
+* JDK21 images are based on Liberica JDK 21.0.4+9 and uses the tag's suffix `-jdk21`.
 
 ### Which one should I use?
 
@@ -49,17 +49,17 @@ There are three variants of the image, all based on `bellsoft/liberica-openjdk-a
 
 ## Tagging
 
-| API level                   | JDK8                             | JDK11                                                      | JDK17                                        | JDK21                              |
-|-----------------------------|----------------------------------|------------------------------------------------------------|----------------------------------------------|------------------------------------|
-| Base Image                  | `jdk8` `latest-jdk8`             | `jdk11`, `latest-jdk11`                                    | `jdk17`, `latest`, `latest-jdk17`            | `jdk21`, `latest-jdk21`            |
-| Android 9.0 (28)            | `android-28-jdk8`                | `android-28`, `android-28-jdk11`                           | `android-28-jdk17`                           | `android-28-jdk21`                 |
-| Android 10 (29)             | `android-29-jdk8`                | `android-29`, `android-29-jdk11`                           | `android-29-jdk17`                           | `android-29-jdk21`                 |
-| Android 11 (30)             | `android-30-jdk8`                | `android-30`, `android-30-jdk11`                           | `android-30-jdk17`                           | `android-30-jdk21`                 |
-| Android 12 (31)             | `android-31-jdk8`                | `android-31`, `android-31-jdk11`                           | `android-31-jdk17`                           | `android-31-jdk21`                 |
-| Android 12L (32)            | `android-32-jdk8`                | `android-32`, `android-32-jdk11`                           | `android-32-jdk17`                           | `android-32-jdk21`                 |
-| Android 13 (33)             | `android-33-jdk8`                | `android-33`, `android-33-jdk11`                           | `android-33-jdk17`                           | `android-33-jdk21`                 |
-| Android 14 (34)             | `android-34-jdk8`, `latest-jdk8` | `android-34`, `android-34-jdk11`, `latest-jdk11`           | `android-34-jdk17`, `latest`, `latest-jdk17` | `android-34-jdk21`, `latest-jdk21` |
-| Android 15 (VanillaIceCream)| `android-VanillaIceCream-jdk8`   | `android-VanillaIceCream`, `android-VanillaIceCream-jdk11` | `android-VanillaIceCream-jdk17`              | `android-VanillaIceCream-jdk21`    |
+| API level        | JDK8                             | JDK11                                            | JDK17                                        | JDK21                              |
+|------------------|----------------------------------|--------------------------------------------------|----------------------------------------------|------------------------------------|
+| Base Image       | `jdk8` `latest-jdk8`             | `jdk11`, `latest-jdk11`                          | `jdk17`, `latest`, `latest-jdk17`            | `jdk21`, `latest-jdk21`            |
+| Android 9.0 (28) | `android-28-jdk8`                | `android-28`, `android-28-jdk11`                 | `android-28-jdk17`                           | `android-28-jdk21`                 |
+| Android 10 (29)  | `android-29-jdk8`                | `android-29`, `android-29-jdk11`                 | `android-29-jdk17`                           | `android-29-jdk21`                 |
+| Android 11 (30)  | `android-30-jdk8`                | `android-30`, `android-30-jdk11`                 | `android-30-jdk17`                           | `android-30-jdk21`                 |
+| Android 12 (31)  | `android-31-jdk8`                | `android-31`, `android-31-jdk11`                 | `android-31-jdk17`                           | `android-31-jdk21`                 |
+| Android 12L (32) | `android-32-jdk8`                | `android-32`, `android-32-jdk11`                 | `android-32-jdk17`                           | `android-32-jdk21`                 |
+| Android 13 (33)  | `android-33-jdk8`                | `android-33`, `android-33-jdk11`                 | `android-33-jdk17`                           | `android-33-jdk21`                 |
+| Android 14 (34)  | `android-34-jdk8`, `latest-jdk8` | `android-34`, `android-34-jdk11`, `latest-jdk11` | `android-34-jdk17`, `latest`, `latest-jdk17` | `android-34-jdk21`, `latest-jdk21` |
+| Android 15 (35)  | `android-35-jdk8`                | `android-35`, `android-35-jdk11`                 | `android-35-jdk17`                           | `android-35-jdk21`                 |
 
 ### Versioning
 
@@ -207,15 +207,15 @@ RUN apk add --no-cache <list-of-packages>
 <details>
   <summary>See content of Android 15 (VanillaIceCream) image</summary>
 
-![Docker Android 14 JDK8 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-VanillaIceCream-jdk8?label=jdk8%20image%20size) ![Docker Android 14 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-VanillaIceCream-jdk11?label=jdk11%20image%20size) ![Docker Android 14 JDK17 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-VanillaIceCream-jdk17?label=jdk17%20image%20size) ![Docker Android 14 JDK21 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-VanillaIceCream-jdk21?label=jdk21%20image%20size)
+![Docker Android 15 JDK8 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-35-jdk8?label=jdk8%20image%20size) ![Docker Android 15 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-35-jdk11?label=jdk11%20image%20size) ![Docker Android 15 JDK17 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-35-jdk17?label=jdk17%20image%20size) ![Docker Android 15 JDK21 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-35-jdk21?label=jdk21%20image%20size)
 
 | Path                             | Version    | Description                         | Location                          |
 |----------------------------------|------------|-------------------------------------|-----------------------------------|
-| build-tools;35.0.0-rc3           | 35.0.0-rc3 | Android SDK Build-Tools             | build-tools/35.0.0-rc3/           |
+| build-tools;35.0.0               | 35.0.0     | Android SDK Build-Tools             | build-tools/35.0.0/               |
 | extras;google;instantapps        | 1.9.0      | Google Play Instant Development SDK | extras/google/instantapps/        |
 | patcher;v4                       | 1          | SDK Patch Applier v4                | patcher/v4/                       |
 | platform-tools                   | 35.0.1     | Android SDK Platform-Tools          | platform-tools/                   |
-| platforms;android-VanillaIceCream| 3          | Android SDK Platform VanillaIceCream| platforms/android-VanillaIceCream/|
+| platforms;android-35             | 1          | Android SDK Platform VanillaIceCream| platforms/android-35/             |
 
 </details>
 

diff --git a/docker/android.Dockerfile b/docker/android.Dockerfile
@@ -6,10 +6,10 @@ LABEL maintainer="Álvaro Salcedo García <alvaro@alvr.dev>"
 ARG BUILD_TOOLS
 ARG TARGET_SDK
 
-ENV PATH $PATH:${ANDROID_SDK_ROOT}/build-tools/${BUILD_TOOLS}
+ENV PATH=$PATH:${ANDROID_SDK_ROOT}/build-tools/${BUILD_TOOLS}
 
 # Install SDK Packages
 RUN sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --install "build-tools;${BUILD_TOOLS}" "platforms;android-${TARGET_SDK}" && \
-    sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --uninstall emulator
+    sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --uninstall emulator || true
 
 CMD ["/bin/bash"]
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
@@ -6,9 +6,9 @@ LABEL maintainer="Álvaro Salcedo García <alvaro@alvr.dev>"
 ARG CMDLINE_VERSION
 ARG SDK_TOOLS_VERSION
 
-ENV ANDROID_SDK_ROOT "/opt/sdk"
-ENV ANDROID_HOME ${ANDROID_SDK_ROOT}
-ENV PATH $PATH:${ANDROID_SDK_ROOT}/cmdline-tools/${CMDLINE_VERSION}/bin:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/extras/google/instantapps
+ENV ANDROID_SDK_ROOT="/opt/sdk"
+ENV ANDROID_HOME=${ANDROID_SDK_ROOT}
+ENV PATH=$PATH:${ANDROID_SDK_ROOT}/cmdline-tools/${CMDLINE_VERSION}/bin:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/extras/google/instantapps
 
 RUN apk upgrade && \
     apk add --no-cache bash curl git unzip wget coreutils openssh-client tar && \

diff --git a/docker/extras b/docker/extras
@@ -2,7 +2,7 @@
 
 set -e
 
-DEFAULT_NDK=26.1.10909125
+DEFAULT_NDK=27.0.12077973
 DEFAULT_CMAKE=3.22.1
 
 install_fastlane() {