Skip to content
This repository was archived by the owner on Mar 31, 2022. It is now read-only.

Commit cfb4b13

Browse files
authored
Fix android licenses (#125)
* Fix android licenses * Changelog, version
1 parent 5273eb8 commit cfb4b13

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## UPCOMING
2+
3+
## `v2017_10_11_1`
4+
5+
* fix android/sdkmanager license issues
6+
17
## `v2017_10_06_1`
28

39
* new preinstalled package: `build-tools-26.0.2`: https://github.com/bitrise-docker/android/pull/122

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}
3535
# To get a full list of available options you can use:
3636
# sdkmanager --list
3737

38-
# Accept "android-sdk-license" before installing components, no need to echo y for each component
38+
# Accept licenses before installing components, no need to echo y for each component
3939
# License is valid for all the standard components in versions installed from this file
4040
# Non-standard components: MIPS system images, preview versions, GDK (Google Glass) and Android Google TV require separate licenses, not accepted there
41-
RUN mkdir -p ${ANDROID_HOME}/licenses
42-
RUN echo 8933bad161af4178b1185d1a37fbf41ea5269c55 > ${ANDROID_HOME}/licenses/android-sdk-license
41+
RUN yes | sdkmanager --licenses
4342

4443
# Platform tools
4544
RUN sdkmanager "platform-tools"
@@ -54,7 +53,8 @@ RUN cd /opt \
5453

5554
# SDKs
5655
# Please keep these in descending order!
57-
RUN sdkmanager \
56+
# The `yes` is for accepting all non-standard tool licenses.
57+
RUN yes | sdkmanager \
5858
"platforms;android-26" \
5959
"platforms;android-25" \
6060
"platforms;android-24" \
@@ -167,5 +167,5 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${ANDROID_HOME}/tools/lib64
167167
# Cleaning
168168
RUN apt-get clean
169169

170-
ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2017_10_06_1
170+
ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2017_10_11_1
171171
CMD bitrise -version

0 commit comments

Comments
 (0)