Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history 
* Added Android S Preview.
* Android SDK Platform-Tools: 30.0.5 → 31.0.0
  • Loading branch information
@alvr
alvr committed Feb 18, 2021
1 parent fb61be5 commit 994703e
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 21 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
strategy:
fail-fast: false
matrix:
android-api: [21, 22, 23, 24, 25, 26, 27, 28, 29, 30]
android-api: [21, 22, 23, 24, 25, 26, 27, 28, 29, 30, S]
jdk: [8, 11]

steps:
Expand Down Expand Up @@ -145,6 +145,8 @@ jobs:
VERSION="29.0.3"
elif [ "${{ matrix.android-api }}" = "30" ]; then
VERSION="30.0.3"
elif [ "${{ matrix.android-api }}" = "S" ]; then
VERSION="31.0.0-rc1"
fi
echo "::set-output name=version::$VERSION"
Expand Down
57 changes: 37 additions & 20 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ implementation("org.glassfish.jaxb:jaxb-runtime:2.3.3")
| Android 9.0 (28) | `android-28`, `android-28-jdk8` | `android-28-jdk11` |
| Android 10 (29) | `android-29`, `android-29-jdk8` | `android-29-jdk11` |
| Android 11 (30) | `android-30`, `android-30-jdk8`, `latest`, `latest-jdk8` | `android-30-jdk11`, `latest-jdk11` |
| Android 12 (31) | `android-S`, `android-S-jdk8` | `android-S-jdk11` |

> :memo: The tags `latest` and `android-XX` will be using the JDK8 base image for one year after AGP 7.0.0 is released to avoid problems with currents CI/CD configurations. That date is yet TBD. After that date, if you want to continue to use JDK8, you must update your configuration with the corresponding tag.
Expand Down Expand Up @@ -97,7 +98,7 @@ A valid example would be `android-30-jdk11-v2021.01.01`. [Here](https://github.c
|-----------------------------|---------|-------------------------------------|------------------------------|
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |

## Extend from Alpine Android Base

Expand Down Expand Up @@ -127,13 +128,13 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;21.1.2 | 21.1.2 | Android SDK Build-Tools | build-tools/21.1.2/ |
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-21 | 2 | Android SDK Platform 21 | platforms/android-21/ |
</details>

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

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

![Docker Android 22 JDK11 Layers](https://img.shields.io/microbadger/layers/alvrme/alpine-android/android-22-jdk11?label=Docker%20JDK11%20Layers&style=for-the-badge) ![Docker Android 22 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-22-jdk11?label=Docker%20JDK11%20Size&style=for-the-badge)
Expand All @@ -143,13 +144,13 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;22.0.1 | 22.0.1 | Android SDK Build-Tools | build-tools/22.0.1/ |
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-22 | 2 | Android SDK Platform 22 | platforms/android-22/ |
</details>

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

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

![Docker Android 23 JDK11 Layers](https://img.shields.io/microbadger/layers/alvrme/alpine-android/android-23-jdk11?label=Docker%20JDK11%20Layers&style=for-the-badge) ![Docker Android 23 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-23-jdk11?label=Docker%20JDK11%20Size&style=for-the-badge)
Expand All @@ -159,13 +160,13 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;23.0.3 | 23.0.3 | Android SDK Build-Tools | build-tools/23.0.3/ |
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-23 | 3 | Android SDK Platform 23 | platforms/android-23/ |
</details>

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

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

![Docker Android 24 JDK11 Layers](https://img.shields.io/microbadger/layers/alvrme/alpine-android/android-24-jdk11?label=Docker%20JDK11%20Layers&style=for-the-badge) ![Docker Android 24 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-24-jdk11?label=Docker%20JDK11%20Size&style=for-the-badge)
Expand All @@ -175,13 +176,13 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;24.0.3 | 24.0.3 | Android SDK Build-Tools | build-tools/24.0.3/ |
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-24 | 2 | Android SDK Platform 24 | platforms/android-24/ |
</details>

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

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

![Docker Android 25 JDK11 Layers](https://img.shields.io/microbadger/layers/alvrme/alpine-android/android-25-jdk11?label=Docker%20JDK11%20Layers&style=for-the-badge) ![Docker Android 25 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-25-jdk11?label=Docker%20JDK11%20Size&style=for-the-badge)
Expand All @@ -191,13 +192,13 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;25.0.3 | 25.0.3 | Android SDK Build-Tools | build-tools/25.0.3/ |
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-25 | 3 | Android SDK Platform 25 | platforms/android-25/ |
</details>

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

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

![Docker Android 26 JDK11 Layers](https://img.shields.io/microbadger/layers/alvrme/alpine-android/android-26-jdk11?label=Docker%20JDK11%20Layers&style=for-the-badge) ![Docker Android 26 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-26-jdk11?label=Docker%20JDK11%20Size&style=for-the-badge)
Expand All @@ -207,13 +208,13 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;26.0.3 | 26.0.3 | Android SDK Build-Tools | build-tools/26.0.3/ |
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-26 | 2 | Android SDK Platform 26 | platforms/android-26/ |
</details>

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

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

![Docker Android 27 JDK11 Layers](https://img.shields.io/microbadger/layers/alvrme/alpine-android/android-27-jdk11?label=Docker%20JDK11%20Layers&style=for-the-badge) ![Docker Android 27 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-27-jdk11?label=Docker%20JDK11%20Size&style=for-the-badge)
Expand All @@ -223,13 +224,13 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;27.0.3 | 27.0.3 | Android SDK Build-Tools | build-tools/27.0.3/ |
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-27 | 3 | Android SDK Platform 27 | platforms/android-27/ |
</details>

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

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

![Docker Android 28 JDK11 Layers](https://img.shields.io/microbadger/layers/alvrme/alpine-android/android-28-jdk11?label=Docker%20JDK11%20Layers&style=for-the-badge) ![Docker Android 28 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-28-jdk11?label=Docker%20JDK11%20Size&style=for-the-badge)
Expand All @@ -239,13 +240,13 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;28.0.3 | 28.0.3 | Android SDK Build-Tools | build-tools/28.0.3/ |
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-28 | 6 | Android SDK Platform 28 | platforms/android-28/ |
</details>

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

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

![Docker Android 29 JDK11 Layers](https://img.shields.io/microbadger/layers/alvrme/alpine-android/android-29-jdk11?label=Docker%20JDK11%20Layers&style=for-the-badge) ![Docker Android 29 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-29-jdk11?label=Docker%20JDK11%20Size&style=for-the-badge)
Expand All @@ -255,13 +256,13 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;29.0.3 | 29.0.3 | Android SDK Build-Tools | build-tools/29.0.3/ |
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-29 | 5 | Android SDK Platform 29 | platforms/android-29/ |
</details>

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

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

![Docker Android 30 JDK11 Layers](https://img.shields.io/microbadger/layers/alvrme/alpine-android/android-30-jdk11?label=Docker%20JDK11%20Layers&style=for-the-badge) ![Docker Android 30 JDK11 Size](https://img.shields.io/docker/image-size/alvrme/alpine-android/android-30-jdk11?label=Docker%20JDK11%20Size&style=for-the-badge)
Expand All @@ -271,10 +272,26 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;30.0.3 | 30.0.3 | Android SDK Build-Tools | build-tools/30.0.3/ |
| 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 | 30.0.5 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-30 | 3 | Android SDK Platform 30 | platforms/android-30/ |
</details>

<details>
<summary>See content of Android 31 image (Preview)</summary>

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

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

| Path | Version | Description | Location |
|-----------------------------|------------|-------------------------------------|------------------------------|
| build-tools;31.0.0-rc1 | 31.0.0-rc1 | Android SDK Build-Tools | build-tools/31.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.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-S | 1 | Android SDK Platform S (Preview) | platforms/android-S/ |
</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 994703e

Please sign in to comment.