summaryrefslogtreecommitdiff
path: root/docker/android-ndk/Dockerfile
diff options
context:
space:
mode:
authorfupduck <fupduck@riseup.net>2018-02-06 05:53:09 -0800
committerfupduck <fupduck@riseup.net>2018-02-06 05:53:09 -0800
commitedd34192484f4eb618fdcc2a68b18168c155d63c (patch)
treed884f63e74911d2ea2cf7bc864414a623e15a2b3 /docker/android-ndk/Dockerfile
parentc0848bac7ac44f4b09f9e5d66ab71f079cb0f514 (diff)
parentd2d61a16fd2a3ea0fd42073de98d1311b184444d (diff)
Merge branch '#8832_update_ics-openvpn' into '0.9.8'
#8832 update ics openvpn See merge request leap/bitmask_android!33
Diffstat (limited to 'docker/android-ndk/Dockerfile')
-rw-r--r--docker/android-ndk/Dockerfile8
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile
index 7739fa47..49b08dcc 100644
--- a/docker/android-ndk/Dockerfile
+++ b/docker/android-ndk/Dockerfile
@@ -1,7 +1,7 @@
FROM 0xacab.org:4567/leap/bitmask_android/android-sdk:latest
MAINTAINER LEAP Encryption Access Project <info@leap.se>
-LABEL Description="Android NDK image based on android-sdk baseimage" Vendor="LEAP" Version="r15c"
+LABEL Description="Android NDK image based on android-sdk baseimage" Vendor="LEAP" Version="r16b"
# Make sure debconf doesn't complain about lack of interactivity
ENV DEBIAN_FRONTEND noninteractive
@@ -24,7 +24,7 @@ RUN apt-get update -qq && \
# ------------------------------------------------------
# --- Install Android NDK (for running C code)
-ENV ANDROID_NDK_VERSION "r15c"
+ENV ANDROID_NDK_VERSION "r16b"
ENV ANDROID_NDK_HOME ${ANDROID_HOME}/android-ndk-${ANDROID_NDK_VERSION}
ENV ANDROID_NDK_URL http://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip
@@ -33,3 +33,7 @@ RUN curl -L $ANDROID_NDK_URL -o ndk.zip \
&& rm -rf ndk.zip
ENV PATH ${PATH}:${ANDROID_NDK_HOME}
+
+# Accept all licenses
+RUN yes | sdkmanager --licenses
+RUN sdkmanager --list \ No newline at end of file