summaryrefslogtreecommitdiff
path: root/docker/android-ndk
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2021-11-12 00:46:35 +0000
committercyberta <cyberta@riseup.net>2021-11-12 00:46:35 +0000
commitc5d722f555b952407dade3abb1ffd537e6747317 (patch)
treea9ebb8b33438589a33ed9ce54ade50371c9fe147 /docker/android-ndk
parent571c0479f7400e56cfdb27408160d8a816cc8610 (diff)
parent8aeb4791b6e024de9aa9c61b574d8c798a3c0a2c (diff)
Merge branch 'tor-snowflake' into 'master'
tor-over-snowflake Closes #9045 See merge request leap/bitmask_android!138
Diffstat (limited to 'docker/android-ndk')
-rw-r--r--docker/android-ndk/Dockerfile11
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile
index 97e47005..7d38973c 100644
--- a/docker/android-ndk/Dockerfile
+++ b/docker/android-ndk/Dockerfile
@@ -12,11 +12,14 @@ ENV DEBIAN_FRONTEND noninteractive
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 -
+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-engine make gcc file lib32stdc++6 lib32z1 && \
+ apt-get -y install docker-ce make gcc file lib32stdc++6 lib32z1 \
+ autoconf autogen automake autopoint autotools-dev gettext-base libtool patch pkg-config && \
apt-get clean && \
apt-get autoclean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -24,7 +27,7 @@ RUN apt-get update -qq && \
# ------------------------------------------------------
# --- Install Android NDK (for running C code)
-ENV ANDROID_NDK_VERSION "r20"
+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