From 7ee7a0812e3e5df206d787c79f8b89241dbc2156 Mon Sep 17 00:00:00 2001 From: soxx Date: Mon, 1 Nov 2021 22:21:22 +0100 Subject: [PATCH] backup --- Dockerfile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index c6e47ad..d1f8db9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,24 @@ FROM gradle -ENV SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" \ - ANDROID_HOME="/usr/local/android-sdk" \ - JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/" +ENV SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip" \ + ANDROID_SDK_ROOT="/usr/local/android-sdk" \ + JAVA_HOME="/usr/lib/jvm/java-1.11.0-openjdk-amd64" \ + PATH="/usr/local/android-sdk/cmdline-tools/tools/bin/:/usr/lib/jvm/java-1.11.0-openjdk-amd64/bin:$PATH" RUN apt update \ - && apt install -y openjdk-8-jdk curl unzip patchutils + && apt install -y openjdk-11-jdk curl unzip patchutils -RUN mkdir "$ANDROID_HOME" .android \ - && cd "$ANDROID_HOME" \ +RUN mkdir $ANDROID_SDK_ROOT .android \ + && cd $ANDROID_SDK_ROOT \ && curl -o sdk.zip $SDK_URL \ && unzip sdk.zip \ && rm sdk.zip \ - && $ANDROID_HOME/tools/bin/sdkmanager --update \ - && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses + && mkdir $ANDROID_SDK_ROOT/cmdline-tools \ + && mv tools $ANDROID_SDK_ROOT/cmdline-tools/ \ + && sdkmanager --update \ + && yes | sdkmanager --licenses ADD entrypoint.sh /entrypoint.sh + ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]