Skip to content

Commit

Permalink
Add Android 12L Developer Preview
Browse files Browse the repository at this point in the history
  • Loading branch information
@alvr
alvr committed Oct 27, 2021
1 parent e293cbf commit 0f92d74
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
strategy:
fail-fast: false
matrix:
android-api: [21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31]
android-api: [21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, Sv2]
jdk: [8, 11, 17]

steps:
Expand Down Expand Up @@ -141,6 +141,7 @@ jobs:
29) BUILD_TOOLS_VERSION="29.0.3" ;;
30) BUILD_TOOLS_VERSION="30.0.3" ;;
31) BUILD_TOOLS_VERSION="31.0.0" ;;
Sv2) BUILD_TOOLS_VERSION="32.0.0-rc1" ;;
esac
echo "BUILD_TOOLS_VERSION=$BUILD_TOOLS_VERSION" >> $GITHUB_ENV
Expand Down
47 changes: 33 additions & 14 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,21 @@ implementation("org.glassfish.jaxb:jaxb-runtime:2.3.3")

## Tagging

| API level | JDK8 | JDK11 | JDK17 |
|------------------|----------------------------------------------------------|------------------------------------|------------------------------------|
| Base Image | `jdk8`, `latest`, `latest-jdk8` | `jdk11`, `latest-jdk11` | `jdk17`, `latest-jdk17` |
| Android 5.0 (21) | `android-21`, `android-21-jdk8` | `android-21-jdk11` | `android-21-jdk17` |
| Android 5.1 (22) | `android-22`, `android-22-jdk8` | `android-22-jdk11` | `android-22-jdk17` |
| Android 6.0 (23) | `android-23`, `android-23-jdk8` | `android-23-jdk11` | `android-23-jdk17` |
| Android 7.0 (24) | `android-24`, `android-24-jdk8` | `android-24-jdk11` | `android-24-jdk17` |
| Android 7.1 (25) | `android-25`, `android-25-jdk8` | `android-25-jdk11` | `android-25-jdk17` |
| Android 8.0 (26) | `android-26`, `android-26-jdk8` | `android-26-jdk11` | `android-26-jdk17` |
| Android 8.1 (27) | `android-27`, `android-27-jdk8` | `android-27-jdk11` | `android-27-jdk17` |
| Android 9.0 (28) | `android-28`, `android-28-jdk8` | `android-28-jdk11` | `android-28-jdk17` |
| Android 10 (29) | `android-29`, `android-29-jdk8` | `android-29-jdk11` | `android-29-jdk17` |
| Android 11 (30) | `android-30`, `android-30-jdk8`, `latest`, `latest-jdk8` | `android-30-jdk11`, `latest-jdk11` | `android-30-jdk17`, `latest-jdk17` |
| Android 12 (31) | `android-31`, `android-31-jdk8` | `android-31-jdk11` | `android-31-jdk17` |
| API level | JDK8 | JDK11 | JDK17 |
|-------------------|----------------------------------------------------------|------------------------------------|------------------------------------|
| Base Image | `jdk8`, `latest`, `latest-jdk8` | `jdk11`, `latest-jdk11` | `jdk17`, `latest-jdk17` |
| Android 5.0 (21) | `android-21`, `android-21-jdk8` | `android-21-jdk11` | `android-21-jdk17` |
| Android 5.1 (22) | `android-22`, `android-22-jdk8` | `android-22-jdk11` | `android-22-jdk17` |
| Android 6.0 (23) | `android-23`, `android-23-jdk8` | `android-23-jdk11` | `android-23-jdk17` |
| Android 7.0 (24) | `android-24`, `android-24-jdk8` | `android-24-jdk11` | `android-24-jdk17` |
| Android 7.1 (25) | `android-25`, `android-25-jdk8` | `android-25-jdk11` | `android-25-jdk17` |
| Android 8.0 (26) | `android-26`, `android-26-jdk8` | `android-26-jdk11` | `android-26-jdk17` |
| Android 8.1 (27) | `android-27`, `android-27-jdk8` | `android-27-jdk11` | `android-27-jdk17` |
| Android 9.0 (28) | `android-28`, `android-28-jdk8` | `android-28-jdk11` | `android-28-jdk17` |
| Android 10 (29) | `android-29`, `android-29-jdk8` | `android-29-jdk11` | `android-29-jdk17` |
| Android 11 (30) | `android-30`, `android-30-jdk8`, `latest`, `latest-jdk8` | `android-30-jdk11`, `latest-jdk11` | `android-30-jdk17`, `latest-jdk17` |
| Android 12 (31) | `android-31`, `android-31-jdk8` | `android-31-jdk11` | `android-31-jdk17` |
| Android Sv2 (31) | `android-Sv2`, `android-Sv2-jdk8` | `android-Sv2-jdk11` | `android-Sv2-jdk17` |

> :memo: The tags `latest` and `android-XX` will be using the JDK8 base image until July 28th, 2022. After that, those tags will be using JDK11.
Expand Down Expand Up @@ -319,6 +320,24 @@ RUN apk add --no-cache <list-of-packages>
| platforms;android-31 | 1 | Android SDK Platform 31 | platforms/android-31/ |
</details>

<details>
<summary>See content of Android Sv2 image</summary>

![Docker Android Sv2 JDK8 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-Sv2-jdk8?label=Docker%20JDK8%20Size&style=for-the-badge)

![Docker Android Sv2 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-Sv2-jdk11?label=Docker%20JDK11%20Size&style=for-the-badge)

![Docker Android Sv2 JDK17 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-Sv2-jdk17?label=Docker%20JDK17%20Size&style=for-the-badge)

| Path | Version | Description | Location |
|-----------------------------|-------------|-------------------------------------|------------------------------|
| build-tools;32.0.0-rc1 | 32.0.0-rc1 | Android SDK Build-Tools | build-tools/32.0.0-rc1/ |
| 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 | 31.0.3 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-Sv2 | 1 | Android SDK Platform Sv2 | platforms/android-Sv2/ |
</details>

## Containers registries

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

0 comments on commit 0f92d74

Please sign in to comment.