From 7140ee36f88ce8b2b5a606926ff993bd225fab1d Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 15 Jul 2021 13:31:52 +0200 Subject: update required NDK version in docker build file --- docker/android-ndk/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 97e47005..4c806eb3 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -24,8 +24,8 @@ RUN apt-get update -qq && \ # ------------------------------------------------------ # --- Install Android NDK (for running C code) -ENV ANDROID_NDK_VERSION "r20" -ENV ANDROID_NDK_HOME ${ANDROID_HOME}/android-ndk-${ANDROID_NDK_VERSION} +ENV ANDROID_NDK_VERSION "r21e" +ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/android-ndk-${ANDROID_NDK_VERSION} ENV ANDROID_NDK_URL http://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip RUN curl -L $ANDROID_NDK_URL -o ndk.zip \ -- cgit v1.2.3 From 20ed4cfe9c2cabe3903da64492e6df64a29c250c Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 19 Jul 2021 14:01:34 +0200 Subject: fix ndk path in android-ndk docker file --- docker/android-ndk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 4c806eb3..2e8e2309 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get update -qq && \ # --- Install Android NDK (for running C code) ENV ANDROID_NDK_VERSION "r21e" -ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/android-ndk-${ANDROID_NDK_VERSION} +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 RUN curl -L $ANDROID_NDK_URL -o ndk.zip \ -- cgit v1.2.3 From 2d5ac7cdd625e920016a3b0e7d9cc65cb7919f82 Mon Sep 17 00:00:00 2001 From: cyberta Date: Mon, 2 Aug 2021 21:58:10 +0200 Subject: update url to docker apt gpg key --- docker/android-emulator/Dockerfile | 2 +- docker/android-ndk/Dockerfile | 2 +- docker/android-sdk/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 9cd8294d..8ffd537c 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update -qq && \ apt-get -y dist-upgrade && \ apt-get -y install 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 - + curl -s https://download.docker.com/linux/debian/gpg | apt-key add - RUN apt-get update -qq && \ apt-get -y install docker-engine mesa-utils && \ apt-get clean && \ diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 2e8e2309..6a9d5a20 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -13,7 +13,7 @@ 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 - + curl -s https://download.docker.com/linux/debian/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 && \ diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 4c4cf2dd..c90d349e 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update -qq && \ apt-get -y dist-upgrade && \ apt-get -y install 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 - + curl -s https://download.docker.com/linux/debian/gpg | apt-key add - RUN apt-get update -qq && \ apt-get install -y docker-engine \ # the basics -- cgit v1.2.3 From a5f118a494ad3f8959a1790f7674376885b650c3 Mon Sep 17 00:00:00 2001 From: cyberta Date: Mon, 2 Aug 2021 22:35:47 +0200 Subject: update url to docker debian-strech stable --- docker/android-emulator/Dockerfile | 2 +- docker/android-ndk/Dockerfile | 2 +- docker/android-sdk/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 8ffd537c..09bc99de 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -15,7 +15,7 @@ ENV ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 RUN apt-get update -qq && \ apt-get -y dist-upgrade && \ apt-get -y install gnupg apt-transport-https -RUN echo 'deb https://apt.dockerproject.org/repo debian-stretch main'> /etc/apt/sources.list.d/docker.list && \ +RUN echo 'deb https://download.docker.com/linux/debian debian-stretch stable' > /etc/apt/sources.list.d/docker.list && \ curl -s https://download.docker.com/linux/debian/gpg | apt-key add - RUN apt-get update -qq && \ apt-get -y install docker-engine mesa-utils && \ diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 6a9d5a20..c60f0f15 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -12,7 +12,7 @@ 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 && \ +RUN echo 'deb https://download.docker.com/linux/debian debian-stretch stable' > /etc/apt/sources.list.d/docker.list && \ curl -s https://download.docker.com/linux/debian/gpg | apt-key add - # JNI build dependencies w/ 32-bit compatible C libs RUN apt-get update -qq && \ diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index c90d349e..5820dd63 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -13,7 +13,7 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -qq && \ apt-get -y dist-upgrade && \ apt-get -y install gnupg apt-transport-https -RUN echo 'deb https://apt.dockerproject.org/repo debian-stretch main'> /etc/apt/sources.list.d/docker.list && \ +RUN echo 'deb https://download.docker.com/linux/debian debian-stretch stable' > /etc/apt/sources.list.d/docker.list && \ curl -s https://download.docker.com/linux/debian/gpg | apt-key add - RUN apt-get update -qq && \ apt-get install -y docker-engine \ -- cgit v1.2.3 From f7e3428d40ada6a482f5c1b02a299d1f92a29be6 Mon Sep 17 00:00:00 2001 From: cyberta Date: Mon, 2 Aug 2021 23:16:02 +0200 Subject: try to install docker according to the docs --- docker/android-emulator/Dockerfile | 6 ++++-- docker/android-ndk/Dockerfile | 6 ++++-- docker/android-sdk/Dockerfile | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'docker') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 09bc99de..d5349da1 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -15,8 +15,10 @@ ENV ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 RUN apt-get update -qq && \ apt-get -y dist-upgrade && \ apt-get -y install gnupg apt-transport-https -RUN echo 'deb https://download.docker.com/linux/debian debian-stretch stable' > /etc/apt/sources.list.d/docker.list && \ - curl -s https://download.docker.com/linux/debian/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 RUN apt-get update -qq && \ apt-get -y install docker-engine mesa-utils && \ apt-get clean && \ diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index c60f0f15..0663916b 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -12,8 +12,10 @@ 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://download.docker.com/linux/debian debian-stretch stable' > /etc/apt/sources.list.d/docker.list && \ - curl -s https://download.docker.com/linux/debian/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 && \ diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 5820dd63..20ae2c48 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -13,8 +13,10 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -qq && \ apt-get -y dist-upgrade && \ apt-get -y install gnupg apt-transport-https -RUN echo 'deb https://download.docker.com/linux/debian debian-stretch stable' > /etc/apt/sources.list.d/docker.list && \ - curl -s https://download.docker.com/linux/debian/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 RUN apt-get update -qq && \ apt-get install -y docker-engine \ # the basics -- cgit v1.2.3 From 0ee29854eccf82d0d387ec8bf888c22a1786baca Mon Sep 17 00:00:00 2001 From: cyberta Date: Mon, 2 Aug 2021 23:24:56 +0200 Subject: docker-engine seems to have been replaced by docker-ce package --- docker/android-emulator/Dockerfile | 2 +- docker/android-ndk/Dockerfile | 2 +- docker/android-sdk/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index d5349da1..138173d4 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -20,7 +20,7 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor "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 RUN apt-get update -qq && \ - apt-get -y install docker-engine mesa-utils && \ + apt-get -y install docker-ce mesa-utils && \ apt-get clean && \ apt-get autoclean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 0663916b..d35053a6 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -18,7 +18,7 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor $(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 && \ apt-get clean && \ apt-get autoclean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 20ae2c48..d10cce6f 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -18,7 +18,7 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor "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 RUN apt-get update -qq && \ - apt-get install -y docker-engine \ + apt-get install -y docker-ce \ # the basics curl unzip git locales \ # java stuff -- cgit v1.2.3 From 36d5a52fb02aa87d232f736e5c8317acb02b466d Mon Sep 17 00:00:00 2001 From: cyberta Date: Tue, 3 Aug 2021 11:17:38 +0200 Subject: add missing debian packages to build tor --- docker/android-ndk/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index d35053a6..7d38973c 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -18,7 +18,8 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor $(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 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/* -- cgit v1.2.3