From 730ab74a2a38cdbe8ac735f2d641d3d19055bf34 Mon Sep 17 00:00:00 2001 From: aguestuser Date: Sun, 30 Apr 2017 19:03:59 -0400 Subject: [ag] modify sdk dockerfile to ensure android-23 platform installs * on remote builds, failure of Android SDK Platform 23 to properly install was causing build failures undetected in local container. see: * to fix this, tweak order of `sdkmanager` calls and remove `echo -y` flags to ensure platform installation completes successfully and build step never tries to install Platform 23 --- docker/android-sdk.dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/android-sdk.dockerfile b/docker/android-sdk.dockerfile index 1007735d..4044a7ec 100644 --- a/docker/android-sdk.dockerfile +++ b/docker/android-sdk.dockerfile @@ -46,18 +46,18 @@ ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME} RUN echo y | sdkmanager "platform-tools" # echo y to accept google licenses # Install Android Support Repositories -RUN echo y | sdkmanager "extras;android;m2repository" - -# Install Target SDK Packages (Please keep in descending order) -RUN echo y | sdkmanager "platforms;android-25" -RUN echo y | sdkmanager "platforms;android-24" -RUN echo y | sdkmanager "platforms;android-23" +RUN sdkmanager "extras;android;m2repository" # Install Build Tools (Please keep in descending order) -RUN echo y | sdkmanager "build-tools;25.0.2" -RUN echo y | sdkmanager "build-tools;25.0.0" -RUN echo y | sdkmanager "build-tools;24.0.3" -RUN echo y | sdkmanager "build-tools;23.0.3" +RUN sdkmanager "build-tools;25.0.2" +RUN sdkmanager "build-tools;25.0.0" +RUN sdkmanager "build-tools;24.0.3" +RUN sdkmanager "build-tools;23.0.3" + +# Install Target SDK Packages (Please keep in descending order) +RUN sdkmanager "platforms;android-25" +RUN sdkmanager "platforms;android-24" +RUN sdkmanager "platforms;android-23" # ------------------------------------------------------ # --- Cleanup -- cgit v1.2.3