diff --git a/Dockerfile b/Dockerfile index 8c0f3a23fa5193280d00b6b63fd35bc0b67d742c..8dd1e15ff915685e54905995ccdf0f9578ccb205 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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