Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 39a4d50

Browse files
alvralvr
committedAug 4, 2024
Update
* Added VanillaIceCream (API 35) * arm64
1 parent e91f271 commit 39a4d50

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed
 

‎.github/workflows/default.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,14 @@ jobs:
9292
password: ${{ secrets.QUAY_PASS }}
9393

9494
- name: Build Android Base JDK${{ matrix.jdk }}
95-
uses: docker/build-push-action@v5
95+
uses: docker/build-push-action@v6
9696
with:
9797
context: ./docker
9898
file: ./docker/base.Dockerfile
9999
push: ${{ startsWith(github.ref, 'refs/tags/v') }}
100100
tags: ${{ steps.meta.outputs.tags }}
101101
labels: ${{ steps.meta.outputs.labels }}
102+
platforms: linux/amd64,linux/arm64
102103
build-args: |
103104
JDK_VERSION=${{ matrix.jdk }}
104105
CMDLINE_VERSION=${{ env.CMDLINE_VERSION }}
@@ -110,7 +111,7 @@ jobs:
110111
runs-on: ubuntu-latest
111112
strategy:
112113
matrix:
113-
android-api: [28, 29, 30, 31, 32, 33, 34, VanillaIceCream]
114+
android-api: [28, 29, 30, 31, 32, 33, 34, 35]
114115
jdk: [8, 11, 17, 21]
115116

116117
steps:
@@ -130,7 +131,7 @@ jobs:
130131
32) BUILD_TOOLS_VERSION="32.0.0" ;;
131132
33) BUILD_TOOLS_VERSION="33.0.2" ;;
132133
34) BUILD_TOOLS_VERSION="34.0.0" ;;
133-
VanillaIceCream) BUILD_TOOLS_VERSION="35.0.0-rc3" ;;
134+
35) BUILD_TOOLS_VERSION="35.0.0" ;;
134135
esac
135136
echo "BUILD_TOOLS_VERSION=$BUILD_TOOLS_VERSION" >> $GITHUB_ENV
136137
@@ -173,13 +174,14 @@ jobs:
173174
password: ${{ secrets.QUAY_PASS }}
174175

175176
- name: Build Android API ${{ matrix.android-api }} JDK${{ matrix.jdk }}
176-
uses: docker/build-push-action@v5
177+
uses: docker/build-push-action@v6
177178
with:
178179
context: ./docker
179180
file: ./docker/android.Dockerfile
180181
push: ${{ startsWith(github.ref, 'refs/tags/v') }}
181182
tags: ${{ steps.meta.outputs.tags }}
182183
labels: ${{ steps.meta.outputs.labels }}
184+
platforms: linux/amd64,linux/arm64
183185
build-args: |
184186
JDK_VERSION=${{ matrix.jdk }}
185187
BUILD_TOOLS=${{ env.BUILD_TOOLS_VERSION }}

‎README.md

+18-18
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333

3434
There are three variants of the image, all based on `bellsoft/liberica-openjdk-alpine`:
3535

36-
* JDK8 images are based on Liberica JDK 8u392-9 and uses the tag's suffix `-jdk8`.
37-
* JDK11 images are based on Liberica JDK 11.0.21-10 and uses the tag's suffix `-jdk11`.
38-
* JDK17 images are based on Liberica JDK 17.0.9-11 and uses the tag's suffix `-jdk17`.
39-
* JDK21 images are based on Liberica JDK 21.0.1+15 and uses the tag's suffix `-jdk21`.
36+
* JDK8 images are based on Liberica JDK 8u422-6 and uses the tag's suffix `-jdk8`.
37+
* JDK11 images are based on Liberica JDK 11.0.24-9 and uses the tag's suffix `-jdk11`.
38+
* JDK17 images are based on Liberica JDK 17.0.12-10 and uses the tag's suffix `-jdk17`.
39+
* JDK21 images are based on Liberica JDK 21.0.4+9 and uses the tag's suffix `-jdk21`.
4040

4141
### Which one should I use?
4242

@@ -49,17 +49,17 @@ There are three variants of the image, all based on `bellsoft/liberica-openjdk-a
4949

5050
## Tagging
5151

52-
| API level | JDK8 | JDK11 | JDK17 | JDK21 |
53-
|-----------------------------|----------------------------------|------------------------------------------------------------|----------------------------------------------|------------------------------------|
54-
| Base Image | `jdk8` `latest-jdk8` | `jdk11`, `latest-jdk11` | `jdk17`, `latest`, `latest-jdk17` | `jdk21`, `latest-jdk21` |
55-
| Android 9.0 (28) | `android-28-jdk8` | `android-28`, `android-28-jdk11` | `android-28-jdk17` | `android-28-jdk21` |
56-
| Android 10 (29) | `android-29-jdk8` | `android-29`, `android-29-jdk11` | `android-29-jdk17` | `android-29-jdk21` |
57-
| Android 11 (30) | `android-30-jdk8` | `android-30`, `android-30-jdk11` | `android-30-jdk17` | `android-30-jdk21` |
58-
| Android 12 (31) | `android-31-jdk8` | `android-31`, `android-31-jdk11` | `android-31-jdk17` | `android-31-jdk21` |
59-
| Android 12L (32) | `android-32-jdk8` | `android-32`, `android-32-jdk11` | `android-32-jdk17` | `android-32-jdk21` |
60-
| Android 13 (33) | `android-33-jdk8` | `android-33`, `android-33-jdk11` | `android-33-jdk17` | `android-33-jdk21` |
61-
| 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` |
62-
| Android 15 (VanillaIceCream)| `android-VanillaIceCream-jdk8` | `android-VanillaIceCream`, `android-VanillaIceCream-jdk11` | `android-VanillaIceCream-jdk17` | `android-VanillaIceCream-jdk21` |
52+
| API level | JDK8 | JDK11 | JDK17 | JDK21 |
53+
|------------------|----------------------------------|--------------------------------------------------|----------------------------------------------|------------------------------------|
54+
| Base Image | `jdk8` `latest-jdk8` | `jdk11`, `latest-jdk11` | `jdk17`, `latest`, `latest-jdk17` | `jdk21`, `latest-jdk21` |
55+
| Android 9.0 (28) | `android-28-jdk8` | `android-28`, `android-28-jdk11` | `android-28-jdk17` | `android-28-jdk21` |
56+
| Android 10 (29) | `android-29-jdk8` | `android-29`, `android-29-jdk11` | `android-29-jdk17` | `android-29-jdk21` |
57+
| Android 11 (30) | `android-30-jdk8` | `android-30`, `android-30-jdk11` | `android-30-jdk17` | `android-30-jdk21` |
58+
| Android 12 (31) | `android-31-jdk8` | `android-31`, `android-31-jdk11` | `android-31-jdk17` | `android-31-jdk21` |
59+
| Android 12L (32) | `android-32-jdk8` | `android-32`, `android-32-jdk11` | `android-32-jdk17` | `android-32-jdk21` |
60+
| Android 13 (33) | `android-33-jdk8` | `android-33`, `android-33-jdk11` | `android-33-jdk17` | `android-33-jdk21` |
61+
| 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` |
62+
| Android 15 (35) | `android-35-jdk8` | `android-35`, `android-35-jdk11` | `android-35-jdk17` | `android-35-jdk21` |
6363

6464
### Versioning
6565

@@ -207,15 +207,15 @@ RUN apk add --no-cache <list-of-packages>
207207
<details>
208208
<summary>See content of Android 15 (VanillaIceCream) image</summary>
209209

210-
![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)
210+
![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)
211211

212212
| Path | Version | Description | Location |
213213
|----------------------------------|------------|-------------------------------------|-----------------------------------|
214-
| build-tools;35.0.0-rc3 | 35.0.0-rc3 | Android SDK Build-Tools | build-tools/35.0.0-rc3/ |
214+
| build-tools;35.0.0 | 35.0.0 | Android SDK Build-Tools | build-tools/35.0.0/ |
215215
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
216216
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
217217
| platform-tools | 35.0.1 | Android SDK Platform-Tools | platform-tools/ |
218-
| platforms;android-VanillaIceCream| 3 | Android SDK Platform VanillaIceCream| platforms/android-VanillaIceCream/|
218+
| platforms;android-35 | 1 | Android SDK Platform VanillaIceCream| platforms/android-35/ |
219219

220220
</details>
221221

‎docker/extras

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
DEFAULT_NDK=26.1.10909125
5+
DEFAULT_NDK=27.0.12077973
66
DEFAULT_CMAKE=3.22.1
77

88
install_fastlane() {

0 commit comments

Comments
 (0)