Explorar o código

Merge pull request #2551 from SchoNie/docker-upstream-changes

chore: changes from upstream docker install
Nicolas Duchon hai 6 meses
pai
achega
7fee758a70
Modificáronse 1 ficheiros con 3 adicións e 4 borrados
  1. 3 4
      test/requirements/Dockerfile-nginx-proxy-tester

+ 3 - 4
test/requirements/Dockerfile-nginx-proxy-tester

@@ -10,14 +10,13 @@ RUN apt-get update \
   && apt-get install -y \
     ca-certificates \
     curl \
-    gnupg \
   && install -m 0755 -d /etc/apt/keyrings \
-  && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
-  && chmod a+r /etc/apt/keyrings/docker.gpg
+  && curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
+  && chmod a+r /etc/apt/keyrings/docker.asc
 
 # Add the Docker repository to Apt sources
 RUN echo \
-  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
   $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
   tee /etc/apt/sources.list.d/docker.list > /dev/null