From da5c56c849234e4a63c51a05d30013512cdabfd1 Mon Sep 17 00:00:00 2001 From: cyBerta <cyberta@riseup.net> Date: Sun, 10 Jan 2021 15:15:40 +0100 Subject: [PATCH] update docker images for sdk 30 --- docker/android-emulator/Dockerfile | 5 +++-- docker/android-sdk/Dockerfile | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 971507997..f4a918389 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -32,7 +32,8 @@ RUN echo y | sdkmanager "emulator" # Install System Images for emulators RUN echo y | sdkmanager "system-images;android-27;google_apis;x86" -RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64" -RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64" +# RUN echo y | sdkmanager "system-images;android-27;google_apis;x86" +# RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64" +# RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64" RUN echo no | avdmanager create avd --force --name testApi27 --abi google_apis/x86 --package 'system-images;android-27;google_apis;x86' \ No newline at end of file diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 9a72228a0..4c4cf2dd8 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -59,16 +59,18 @@ RUN echo y | sdkmanager "platform-tools" # echo y to accept google licenses RUN sdkmanager "extras;android;m2repository" # Install Build Tools (Please keep in descending order) -RUN sdkmanager "build-tools;28.0.3" -RUN sdkmanager "build-tools;27.0.3" -RUN sdkmanager "build-tools;25.0.2" -RUN sdkmanager "build-tools;23.0.3" +RUN sdkmanager "build-tools;30.0.3" +# RUN sdkmanager "build-tools;28.0.3" +# RUN sdkmanager "build-tools;27.0.3" +# RUN sdkmanager "build-tools;25.0.2" +# RUN sdkmanager "build-tools;23.0.3" # Install Target SDK Packages (Please keep in descending order) -RUN sdkmanager "platforms;android-28" -RUN sdkmanager "platforms;android-27" -RUN sdkmanager "platforms;android-25" -RUN sdkmanager "platforms;android-23" +RUN sdkmanager "platforms;android-30" +# RUN sdkmanager "platforms;android-28" +# RUN sdkmanager "platforms;android-27" +# RUN sdkmanager "platforms;android-25" +# RUN sdkmanager "platforms;android-23" RUN echo "accept all licenses" # Accept all licenses -- GitLab