summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/android-emulator/Dockerfile6
-rw-r--r--docker/android-ndk/Dockerfile6
-rw-r--r--docker/android-sdk/Dockerfile6
3 files changed, 12 insertions, 6 deletions
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