From b1442c04cd482628ade43c3082467d442e3549cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Salcedo=20Garc=C3=ADa?= Date: Wed, 5 May 2021 20:00:00 +0200 Subject: [PATCH] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * JDK8: 8u282-b08 → 8u292-b10 * JDK11: 11.0.10+9 → 11.0.11+9 * Android SDK Command-line Tools: 3.0 → 4.0 --- README.md | 6 +++--- docker/base.Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index de12788..f648d1e 100644 --- a/README.md +++ b/README.md @@ -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? @@ -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 diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index 1951161..cd7fc2e 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -5,8 +5,8 @@ LABEL maintainer="Álvaro Salcedo García " 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 && \