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-sdk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/android-sdk/Dockerfile') 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-sdk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/android-sdk/Dockerfile') 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-sdk/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docker/android-sdk/Dockerfile') 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-sdk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/android-sdk/Dockerfile') 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