summaryrefslogtreecommitdiff
path: root/docker/android-ndk
diff options
context:
space:
mode:
Diffstat (limited to 'docker/android-ndk')
-rw-r--r--docker/android-ndk/Dockerfile31
1 files changed, 18 insertions, 13 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile
index 0a3eabfd..34d1d641 100644
--- a/docker/android-ndk/Dockerfile
+++ b/docker/android-ndk/Dockerfile
@@ -1,27 +1,32 @@
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="r12b"
+LABEL Description="Android NDK image based on android-sdk baseimage" Vendor="LEAP" Version="r15c"
+
+# Make sure debconf doesn't complain about lack of interactivity
+ENV DEBIAN_FRONTEND noninteractive
# ------------------------------------------------------
# --- Install System Dependencies
+RUN if test -f /etc/apt/sources.list.d/leap.list; then rm /etc/apt/sources.list.d/leap.list; fi
+# Need docker package in order to do Docker-in-Docker (DIND)
+RUN apt-get update -qq && \
+ apt-get -y dist-upgrade && \
+ apt-get install -y gnupg apt-transport-https
+RUN echo 'deb https://apt.dockerproject.org/repo debian-stretch main'> /etc/apt/sources.list.d/docker.list && \
+ curl -s https://apt.dockerproject.org/gpg | apt-key add -
+# JNI build dependencies w/ 32-bit compatible C libs
+RUN apt-get update -qq && \
+ apt-get -y install docker-engine make gcc file lib32stdc++6 lib32z1 && \
+ apt-get clean && \
+ apt-get autoclean && \
+ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-RUN apt-get update -qq
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
- make gcc file lib32stdc++6 lib32z1 # JNI build dependencies w/ 32-bit compatible C libs
# ------------------------------------------------------
# --- Install Android NDK (for running C code)
-# NOTE(@aguestuser|4.23.17)
-# We woud like to use te current version of Android NDK (r14b) but cannot
-# due to pinned dependency on year-old version of `ics-openvpn`
-# which has transitive dependency on `openssl` which will not compile with `clang`
-# (starting in 13b, android ndk uses `clang` isntead of `gcc`)
-# Upon rebasing onto to current HEAD of `ics-openvpn` and resolving conflicts, we
-# should update to current version of `ndk`.
-
-ENV ANDROID_NDK_VERSION "r12b"
+ENV ANDROID_NDK_VERSION "r15c"
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