From 5490a1c24c6c1b6f201a27155c01eb4b129bcb27 Mon Sep 17 00:00:00 2001 From: Tobias Schlatter Date: Mon, 27 Sep 2021 16:20:36 +0200 Subject: [PATCH 1/2] Upgrade Docker dind to 20.10.8 for 64bit platforms This is an alternative to #327. As the discussion on that PR shows, it seems docker is not going to provide updates for the arm32 platform anymore. Fixes #326 and fixes #330. --- docker/docker/Dockerfile.linux.amd64 | 2 +- docker/docker/Dockerfile.linux.arm64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index c39c5787..9f854b41 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -1,4 +1,4 @@ -FROM docker:19.03.8-dind +FROM docker:20.10.8-dind ENV DOCKER_HOST=unix:///var/run/docker.sock diff --git a/docker/docker/Dockerfile.linux.arm64 b/docker/docker/Dockerfile.linux.arm64 index 2a70c6a8..f20b5e7e 100644 --- a/docker/docker/Dockerfile.linux.arm64 +++ b/docker/docker/Dockerfile.linux.arm64 @@ -1,4 +1,4 @@ -FROM arm64v8/docker:19.03.8-dind +FROM arm64v8/docker:20.10.8-dind ENV DOCKER_HOST=unix:///var/run/docker.sock From 501eae03f273467aa7195d72b798201673e179be Mon Sep 17 00:00:00 2001 From: Tobias Schlatter Date: Mon, 18 Oct 2021 16:40:41 +0200 Subject: [PATCH 2/2] Upgrade to dind 20.10.9 which has been released in the meanwhile --- docker/docker/Dockerfile.linux.amd64 | 2 +- docker/docker/Dockerfile.linux.arm64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index 9f854b41..54e536ef 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -1,4 +1,4 @@ -FROM docker:20.10.8-dind +FROM docker:20.10.9-dind ENV DOCKER_HOST=unix:///var/run/docker.sock diff --git a/docker/docker/Dockerfile.linux.arm64 b/docker/docker/Dockerfile.linux.arm64 index f20b5e7e..d12c4f81 100644 --- a/docker/docker/Dockerfile.linux.arm64 +++ b/docker/docker/Dockerfile.linux.arm64 @@ -1,4 +1,4 @@ -FROM arm64v8/docker:20.10.8-dind +FROM arm64v8/docker:20.10.9-dind ENV DOCKER_HOST=unix:///var/run/docker.sock