diff --git a/AndroidSDK/Dockerfile b/AndroidSDK/Dockerfile index f76ff03..56b46a5 100644 --- a/AndroidSDK/Dockerfile +++ b/AndroidSDK/Dockerfile @@ -1,15 +1,3 @@ -FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild AS ADK - -ENV ANDROID_HOME "/opt/android-sdk-linux" -ENV ANDROID_SDK_VER 11076708 -ENV ANDROID_SDK_ROOT $ANDROID_HOME - -RUN curl -sO https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VER}_latest.zip - -RUN unzip -qq /commandlinetools-linux-${ANDROID_SDK_VER}_latest.zip -d $ANDROID_SDK_ROOT -RUN rm -v /commandlinetools-linux-${ANDROID_SDK_VER}_latest.zip -ADD packages.txt / - FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild ENV ANDROID_HOME "/opt/android-sdk-linux" @@ -19,8 +7,6 @@ ENV ANDROID_SDK_ROOT $ANDROID_HOME ENV PATH $PATH:$ANDROID_HOME/cmdline-tools:$ANDROID_HOME/cmdline-tools/bin:$ANDROID_HOME/platform-tools -COPY --from=ADK ${ANDROID_HOME} ${ANDROID_HOME} - RUN mkdir -p $ANDROID_HOME/licenses RUN yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --licenses --sdk_root=${ANDROID_SDK_ROOT} diff --git a/AndroidSDK/packages.txt b/AndroidSDK/packages.txt index c54a64c..df07889 100644 --- a/AndroidSDK/packages.txt +++ b/AndroidSDK/packages.txt @@ -1,4 +1,3 @@ -build-tools;latest build-tools;35.0.0 build-tools;34.0.0 platforms;android-35