diff options
| author | cyberta <cyberta@riseup.net> | 2019-02-18 01:07:35 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2019-02-18 01:07:35 -0800 |
| commit | ab63f103c74cc53657a06b51e2e9b093f5d0eedd (patch) | |
| tree | 734f8ba36cbe6d4c0341ad6a405f47ce84cc8bbe | |
| parent | 245991fc605d3b284c27fb3c36931f57b14329b0 (diff) | |
| parent | 40082188ebb9bc1be25b410ba2f83561f24b487f (diff) | |
Merge branch 'feature/update_sdk' into 'master'
Accept new sdk licenses in docker
See merge request leap/bitmask_android!86
| -rw-r--r-- | docker/android-ndk/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/android-sdk/Dockerfile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 8e7a124b..60bad165 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -34,6 +34,7 @@ RUN curl -L $ANDROID_NDK_URL -o ndk.zip \ ENV PATH ${PATH}:${ANDROID_NDK_HOME} +RUN echo "accept all licenses" # Accept all licenses RUN yes | sdkmanager --licenses RUN sdkmanager --list diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 4c0c1782..9a72228a 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -70,5 +70,6 @@ RUN sdkmanager "platforms;android-27" RUN sdkmanager "platforms;android-25" RUN sdkmanager "platforms;android-23" +RUN echo "accept all licenses" # Accept all licenses RUN yes | sdkmanager --licenses
\ No newline at end of file |