From 72e6357c29e1e505685ed80ca0e864a342d4fe94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wr=C3=B3tniak?= Date: Wed, 8 Nov 2017 21:14:56 +0100 Subject: [PATCH] New preinstalled package: build-tools-27.0.1 Removed duplicated emulator installation --- CHANGELOG.md | 4 ++++ Dockerfile | 11 ++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1af6a2d..519727d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## UPCOMING +## `v2017_11_08_1` + +* new preinstalled packages: `build-tools-27.0.1`: https://github.com/bitrise-docker/android/pull/134 + ## `v2017_11_07_1` * new preinstalled packages: diff --git a/Dockerfile b/Dockerfile index e9c4d83..4297227 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,14 +43,6 @@ RUN yes | sdkmanager --licenses # Platform tools RUN sdkmanager "platform-tools" -# Emulator -# RUN sdkmanager "emulator" -# For now we'll keep using 26.1.2 ; 26.1.3 had some booting issues... -RUN cd /opt \ - && wget https://dl.google.com/android/repository/emulator-linux-4077558.zip -O emulator.zip \ - && unzip -q emulator.zip -d ${ANDROID_HOME} \ - && rm emulator.zip - # SDKs # Please keep these in descending order! # The `yes` is for accepting all non-standard tool licenses. @@ -67,6 +59,7 @@ RUN yes | sdkmanager \ "platforms;android-19" \ "platforms;android-17" \ "platforms;android-15" \ + "build-tools;27.0.1" \ "build-tools;27.0.0" \ "build-tools;26.0.2" \ "build-tools;26.0.1" \ @@ -161,5 +154,5 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${ANDROID_HOME}/tools/lib64 # Cleaning RUN apt-get clean -ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2017_10_27_1 +ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2017_11_08_1 CMD bitrise -version