@@ -9,7 +9,7 @@ ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-l
99 ANDROID_SDK_ROOT="/opt/android" \
1010 ANDROID_HOME="/opt/android/sdk"
1111
12- 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
12+ ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/ bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$ANT_HOME/bin:$MAVEN_HOME/bin:$GRADLE_HOME/bin
1313
1414WORKDIR /opt
1515
@@ -19,14 +19,17 @@ RUN apt-get -qq update && \
1919# Installs Android SDK
2020RUN mkdir android && cd android && \
2121 wget -O tools.zip ${ANDROID_SDK_URL} && \
22- unzip tools.zip && rm tools.zip
22+ unzip tools.zip && rm tools.zip && \
23+ cd cmdline-tools && \
24+ mkdir latest && \
25+ ls | grep -v latest | xargs mv -t latest
2326
2427RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \
25- while true; do echo 'y' ; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \
26- while true; do echo 'y' ; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platforms;android-28" "platforms;android-29" "platforms;android-30" && \
27- while true; do echo 'y' ; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platforms;android-31" "platforms;android-32" "platforms;android-33" && \
28- 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" && \
29- while true; do echo 'y' ; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24" "skiaparser;1" "skiaparser;2" "skiaparser;3"
28+ while true; do echo 'y' ; sleep 2; done | sdkmanager "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \
29+ while true; do echo 'y' ; sleep 2; done | sdkmanager "platforms;android-28" "platforms;android-29" "platforms;android-30" && \
30+ while true; do echo 'y' ; sleep 2; done | sdkmanager "platforms;android-31" "platforms;android-32" "platforms;android-33" && \
31+ while true; do echo 'y' ; sleep 2; done | sdkmanager "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository" && \
32+ while true; do echo 'y' ; sleep 2; done | sdkmanager "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24" "skiaparser;1" "skiaparser;2" "skiaparser;3"
3033
3134RUN chmod a+x -R $ANDROID_SDK_ROOT && \
3235 chown -R root:root $ANDROID_SDK_ROOT && \
0 commit comments