Skip to content

Commit f2b16f9

Browse files
alvralvr
committed
Added Android 16.1 (Baklava) and Android 17 (CinnamonBun) support
* Added Android API 36.1 and CinnamonBun to build matrix * Build Tools 37.0.0-rc1 for CinnamonBun * Updated README with new API level documentation
1 parent 595a8dd commit f2b16f9

2 files changed

Lines changed: 47 additions & 13 deletions

File tree

‎.github/workflows/default.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
runs-on: ubuntu-latest
112112
strategy:
113113
matrix:
114-
android-api: [28, 29, 30, 31, 32, 33, 34, 35, 36]
114+
android-api: [28, 29, 30, 31, 32, 33, 34, 35, 36, 36.1, CinnamonBun]
115115
jdk: [8, 11, 17, 21]
116116

117117
steps:
@@ -133,6 +133,8 @@ jobs:
133133
34) BUILD_TOOLS_VERSION="34.0.0" ;;
134134
35) BUILD_TOOLS_VERSION="35.0.1" ;;
135135
36) BUILD_TOOLS_VERSION="36.1.0" ;;
136+
36.1) BUILD_TOOLS_VERSION="36.1.0" ;;
137+
CinnamonBun) BUILD_TOOLS_VERSION="37.0.0-rc1" ;;
136138
*)
137139
echo "Unsupported Android API version: ${{ matrix.android-api }}"
138140
exit 1 ;;

‎README.md‎

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,20 @@ There are four variants of the image, all based on `bellsoft/liberica-openjdk-al
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` | `android-34`, `android-34-jdk11` | `android-34-jdk17` | `android-34-jdk21` |
62-
| Android 15 (35) | `android-35-jdk8` | `android-35`, `android-35-jdk11` | `android-35-jdk17` | `android-35-jdk21` |
63-
| Android 16 (36) | `android-36-jdk8`, `latest-jdk8` | `android-36`, `android-36-jdk11`, `latest-jdk11` | `android-36-jdk17`, `latest`, `latest-jdk17` | `android-36-jdk21`, `latest-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` | `android-34`, `android-34-jdk11` | `android-34-jdk17` | `android-34-jdk21` |
62+
| Android 15 (35) | `android-35-jdk8` | `android-35`, `android-35-jdk11` | `android-35-jdk17` | `android-35-jdk21` |
63+
| Android 16 (36.0) | `android-36-jdk8`, `latest-jdk8` | `android-36`, `android-36-jdk11`, `latest-jdk11` | `android-36-jdk17`, `latest`, `latest-jdk17` | `android-36-jdk21`, `latest-jdk21` |
64+
| Android 16 (36.1) | `android-36.1-jdk8` | `android-36.1`, `android-36.1-jdk11` | `android-36.1-jdk17` | `android-36.1-jdk21` |
65+
| Android 17 (37) | `android-37-jdk8`, `latest-jdk8` | `android-37`, `android-37-jdk11`, `latest-jdk11` | `android-37-jdk17`, `latest`, `latest-jdk17` | `android-37-jdk21`, `latest-jdk21` |
6466

6567
### Versioning
6668

@@ -235,6 +237,36 @@ RUN apk add --no-cache <list-of-packages>
235237

236238
</details>
237239

240+
<details>
241+
<summary>See content of Android 16.1 (Baklava) image</summary>
242+
243+
![Docker Android 16.1 JDK8 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-36.1-jdk8?label=jdk8%20image%20size) ![Docker Android 16.1 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-36.1-jdk11?label=jdk11%20image%20size) ![Docker Android 16.1 JDK17 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-36.1-jdk17?label=jdk17%20image%20size) ![Docker Android 16.1 JDK21 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-36.1-jdk21?label=jdk21%20image%20size)
244+
245+
| Path | Version | Description | Location |
246+
|---------------------------|------------|-------------------------------------|----------------------------|
247+
| build-tools;36.1.0 | 36.1.0 | Android SDK Build-Tools | build-tools/36.1.0/ |
248+
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
249+
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
250+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
251+
| platforms;android-36.1 | 2 | Android SDK Platform 36.1 | platforms/android-36.1/ |
252+
253+
</details>
254+
255+
<details>
256+
<summary>See content of Android 17 (CinnamonBun) image</summary>
257+
258+
![Docker Android 17 JDK8 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-37-jdk8?label=jdk8%20image%20size) ![Docker Android 17 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-37-jdk11?label=jdk11%20image%20size) ![Docker Android 17 JDK17 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-37-jdk17?label=jdk17%20image%20size) ![Docker Android 17 JDK21 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-37-jdk21?label=jdk21%20image%20size)
259+
260+
| Path | Version | Description | Location |
261+
|-------------------------------|------------|-------------------------------------|--------------------------------|
262+
| build-tools;37.0.0-rc1 | 37.0.0-rc1 | Android SDK Build-Tools | build-tools/37.0.0-rc1/ |
263+
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
264+
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
265+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
266+
| platforms;android-CinnamonBun | 1 | Android SDK Platform CinnamonBun | platforms/android-CinnamonBun/ |
267+
268+
</details>
269+
238270
## Containers registries
239271

240272
Because of the [DockerHub rate limits](https://www.docker.com/increase-rate-limits), the image is now in three different containers registries:

0 commit comments

Comments
 (0)