Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
* JDK8: 8u282-b08 → 8u292-b10
* JDK11: 11.0.10+9 → 11.0.11+9

* Android SDK Command-line Tools: 3.0 → 4.0
  • Loading branch information
alvr committed May 5, 2021
1 parent e96b693 commit b1442c0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@

There are two variants of the image:

* JDK8 images are based on `adoptopenjdk/openjdk8:alpine` (JDK 8u282-b08) and uses the tag's suffix `-jdk8`.
* JDK11 images are based on `adoptopenjdk/openjdk11:alpine` (JDK 11.0.10+9) and uses the tag's suffix `-jdk11`.
* JDK8 images are based on `adoptopenjdk/openjdk8:alpine` (JDK 8u292-b10) and uses the tag's suffix `-jdk8`.
* JDK11 images are based on `adoptopenjdk/openjdk11:alpine` (JDK 11.0.11+9) and uses the tag's suffix `-jdk11`.

### Which one should I use?

Expand Down Expand Up @@ -71,7 +71,7 @@ implementation("org.glassfish.jaxb:jaxb-runtime:2.3.3")

> :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.
> :warning: Android 12 is in a preview state. Preview versions are tagged differently using the letter of the version instead the API level.
> :warning: Android 12 is in a preview state. Preview versions are tagged differently using the letter of the version instead the API level. Android 12 will be using `latest` tag one month and a half after the stable release (TBD).
### Versioning

Expand Down
4 changes: 2 additions & 2 deletions docker/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ LABEL maintainer="Álvaro Salcedo García <[email protected]>"

ENV ANDROID_SDK_ROOT "/opt/sdk"
ENV ANDROID_HOME ${ANDROID_SDK_ROOT}
ENV CMDLINE_VERSION "3.0"
ENV SDK_TOOLS "6858069"
ENV CMDLINE_VERSION "4.0"
ENV SDK_TOOLS "7302050"
ENV PATH $PATH:${ANDROID_SDK_ROOT}/cmdline-tools/${CMDLINE_VERSION}/bin:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/extras/google/instantapps

RUN apk add --no-cache bash git unzip wget && \
Expand Down

0 comments on commit b1442c0

Please sign in to comment.