Unverified Commit 9da97174 authored by Jan Grewe's avatar Jan Grewe Committed by GitHub

Merge branch 'master' into master

parents b8c22412 37cb9352
......@@ -5,7 +5,7 @@
# https://git.faked.org/jan/gitlab-ci-android
#
FROM ubuntu:17.04
FROM ubuntu:17.10
MAINTAINER Jan Grewe <jan@faked.org>
ENV VERSION_SDK_TOOLS "3859397"
......@@ -38,7 +38,7 @@ RUN curl -s https://dl.google.com/android/repository/sdk-tools-linux-${VERSION_S
RUN mkdir -p $ANDROID_HOME/licenses/ \
&& echo "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e" > $ANDROID_HOME/licenses/android-sdk-license \
&& echo "84831b9409646a918e30573bab4c9c91346d8abd" > $ANDROID_HOME/licenses/android-sdk-preview-license
&& echo "84831b9409646a918e30573bab4c9c91346d8abd\n504667f4c0de7af1a06de9f4b1727b84351f2910" > $ANDROID_HOME/licenses/android-sdk-preview-license
ADD packages.txt /sdk
RUN mkdir -p /root/.android && \
......@@ -47,4 +47,5 @@ RUN mkdir -p /root/.android && \
RUN while read -r package; do PACKAGES="${PACKAGES}${package} "; done < /sdk/packages.txt && \
${ANDROID_HOME}/tools/bin/sdkmanager ${PACKAGES}
RUN yes | ${ANDROID_HOME}/tools/bin/sdkmanager --licenses
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment