summaryrefslogtreecommitdiff
path: root/docker/android-ndk
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@autistici.org>2022-01-25 01:25:47 +0000
committercyberta <cyberta@riseup.net>2022-01-25 01:25:47 +0000
commit259e4f236a1a229674875573778aa3307999db0a (patch)
tree029b1c7a82b0e430676e603fe906ad58b40b57da /docker/android-ndk
parent8a14c1edef316e211afdd642e72d093191bceed8 (diff)
Update CI Docker images to Bullseye
Diffstat (limited to 'docker/android-ndk')
-rw-r--r--docker/android-ndk/Dockerfile22
1 files changed, 14 insertions, 8 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile
index 82d9155b..83c81329 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
+FROM registry.0xacab.org/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="r20"
+LABEL Description="Android NDK image based on android-sdk baseimage" Vendor="LEAP" Version="r21e"
# Make sure debconf doesn't complain about lack of interactivity
ENV DEBIAN_FRONTEND noninteractive
@@ -9,16 +9,21 @@ ENV DEBIAN_FRONTEND noninteractive
# ------------------------------------------------------
# --- Install System Dependencies
# Need docker package in order to do Docker-in-Docker (DIND)
+RUN lsb_release -a
+
RUN apt-get update -qq && \
apt-get -y dist-upgrade && \
apt-get install -y gnupg apt-transport-https
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
- echo \
- "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
- $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+# Docker apt details should be inherited from android_sdk
+#RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
+# echo \
+# "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
+# $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+
# JNI build dependencies w/ 32-bit compatible C libs
RUN apt-get update -qq && \
- apt-get -y install docker-ce make gcc file lib32stdc++6 lib32z1 \
+ apt-get -y install docker-ce docker-ce-cli make gcc file lib32stdc++6 lib32z1 \
autoconf autogen automake autopoint autotools-dev gettext-base libtool patch pkg-config && \
apt-get clean && \
apt-get autoclean && \
@@ -30,6 +35,7 @@ RUN apt-get update -qq && \
ENV ANDROID_NDK_VERSION "r21e"
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
+ENV ANDROID_SDK_ROOT ${ANDROID_HOME}/latest/cmdline-tools
RUN curl -L $ANDROID_NDK_URL -o ndk.zip \
&& unzip ndk.zip -d $ANDROID_HOME/ndk \
@@ -41,6 +47,6 @@ ENV PATH ${PATH}:${ANDROID_NDK_HOME}
RUN echo "accept all licenses"
# Accept all licenses
-RUN yes | sdkmanager --licenses
+RUN echo y | sdkmanager --licenses
RUN sdkmanager --list