Merge pull request #30701 from ameukam/bootstrap-fix-docker-install

images/bootstrap: update Docker installation
kubernetes · Sep 13, 2023 · 8c440c6 · 8c440c6
2 parents 201032c + 5ed9207
commit 8c440c6
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/images/bootstrap/Dockerfile b/images/bootstrap/Dockerfile
@@ -88,11 +88,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     rm -rf /var/lib/apt/lists/*
 
 # Add the Docker apt-repository
-RUN curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg \
-    | apt-key add - && \
-    add-apt-repository \
-    "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
-    $(lsb_release -cs) stable"
+RUN curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
+    && chmod a+r /etc/apt/keyrings/docker.gpg \
+    && echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
+    "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
+    tee /etc/apt/sources.list.d/docker.list > /dev/null
 
 # Install Docker
 # TODO: the `sed` is a bit of a hack, look into alternatives.