feat: upgrade Android SDK (#36)

* feat: upgrade Android SDK

* chore: disable cache for builds

* chore: well then no android-33 😿

* chore: update README

Author: beevelop

.github/workflows/docker.yml

@@ -52,8 +52,8 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          cache-from: type=local,src=${{ github.workspace }}/cache
-          cache-to: type=local,dest=${{ github.workspace }}/cache
+          # cache-from: type=local,src=${{ github.workspace }}/cache
+          # cache-to: type=local,dest=${{ github.workspace }}/cache
       # - name: Run Trivy vulnerability scanner
       #   uses: aquasecurity/[email protected]
       #   with:

Dockerfile

@@ -1,12 +1,13 @@
 FROM beevelop/java
 
 # https://developer.android.com/studio/#downloads
-ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip" \
-    ANDROID_BUILD_TOOLS_VERSION=32.0.0 \
+ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip" \
+    ANDROID_BUILD_TOOLS_VERSION=33.0.1 \
     ANT_HOME="/usr/share/ant" \
     MAVEN_HOME="/usr/share/maven" \
     GRADLE_HOME="/usr/share/gradle" \
-    ANDROID_SDK_ROOT="/opt/android"
+    ANDROID_SDK_ROOT="/opt/android" \
+    ANDROID_HOME="/opt/android/sdk"
 
 ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$ANT_HOME/bin:$MAVEN_HOME/bin:$GRADLE_HOME/bin
 
@@ -22,7 +23,6 @@ RUN mkdir android && cd android && \
 
 RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \
     while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \
-    while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platforms;android-25" "platforms;android-26" "platforms;android-27" && \
     while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platforms;android-28" "platforms;android-29" "platforms;android-30" && \
     while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platforms;android-31" "platforms;android-32" && \
     while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository" &&  \

README.md

@@ -1,4 +1,4 @@
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/beevelop/docker-android/Docker%20Image?style=for-the-badge)
+![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/beevelop/docker-android/docker.yml?style=for-the-badge)
 ![Docker Pulls](https://img.shields.io/docker/pulls/beevelop/android.svg?style=for-the-badge)
 ![Docker Stars](https://img.shields.io/docker/stars/beevelop/android?style=for-the-badge)
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/beevelop/android/latest?style=for-the-badge)
@@ -9,30 +9,39 @@
 [![Beevelop](https://img.shields.io/badge/-%20Made%20with%20%F0%9F%8D%AF%20by%20%F0%9F%90%9Dvelop-blue.svg?style=for-the-badge)](https://beevelop.com)
 
 # Android 12 (API levels 31,32)
-### based on [beevelop/java](https://github.com/beevelop/docker-java)
-- Java 8 (OpenJDK 1.8.0_282)
-- Gradle 4.4.1 (Groovy: 2.4.16)
+
+## based on [beevelop/java](https://github.com/beevelop/docker-java)
+
+- Java 11.0.17
+- Gradle 4.4.1 (Groovy: 2.4.17)
 - Apache Maven 3.6.3
 - Ant 1.10.7
 
-### Pull, build or run this image
+## Pull, build or run this image
+
 ```bash
 # pull the most recent tag / release
-docker pull beevelop/android:v2021.06.2
+docker pull beevelop/android:v2023.01.1
 
 # or run the image interactively
-docker run --rm --name beevelop -it beevelop/android:v2021.06.2 bash
+docker run --rm --name beevelop -it beevelop/android:v2023.01.1 bash
 
 # or build the image from GitHub
 docker build -t beevelop/android github.com/beevelop/docker-base
 ```
 
-### Or use as base image
+## Or use it as a base image
+
 ```Dockerfile
-FROM beevelop/android:v2021.06.2
+FROM beevelop/android:v2023.01.1
+
+# accepts all the Licenses (please read first)
+RUN yes | sdkmanager --licenses --sdk_root=$ANDROID_SDK_ROOT
+
 ```
 
 ## Maintenance
+
 - [Command Line Tools Download](https://developer.android.com/studio#span-idcommand-toolsa-namecmdline-toolsacommand-line-tools-onlyspan)
 - List build-tools versions: `sdkmanager --sdk_root=${ANDROID_SDK_ROOT}  --list | grep build-tools`
 - List platforms: `sdkmanager --sdk_root=${ANDROID_SDK_ROOT}  --list | grep 'platforms:'`
@@ -41,8 +50,6 @@ FROM beevelop/android:v2021.06.2
 
 ![Beevelop's Docker Image Hierarchy](https://gist.githubusercontent.com/beevelop/b0cddab7209a683c77560d06ff00bc8e/raw/15429ee1d02e2c4dc019b760ca8c7ceff5911b82/hierarchy.png)
 
----
-
-### Use tags where possible, because...
+### Use tags where possible, because
 
 ![One does not simply use latest](https://i.imgflip.com/1fgwxr.jpg)