From 2b540a68acef13de94c77cd1da0db99afc8e0190 Mon Sep 17 00:00:00 2001
From: vdovinmih <102321665+vdovinmih@users.noreply.github.com>
Date: Wed, 13 Apr 2022 02:22:33 +0300
Subject: [PATCH 1/2] Update Dockerfile.linux.amd64

Bump version to 20.10.14
---
 docker/docker/Dockerfile.linux.amd64 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64
index 54e536e..c0d8854 100644
--- a/docker/docker/Dockerfile.linux.amd64
+++ b/docker/docker/Dockerfile.linux.amd64
@@ -1,4 +1,4 @@
-FROM docker:20.10.9-dind
+FROM docker:20.10.14-dind
 
 ENV DOCKER_HOST=unix:///var/run/docker.sock
 

From bdefe42719558f33c9dedcc83fc1ba9068946bee Mon Sep 17 00:00:00 2001
From: TP Honey <tp@harness.io>
Date: Tue, 31 May 2022 12:19:40 +0100
Subject: [PATCH 2/2] (feat) update arm64 base image, and add some dev notes to
 the readme

---
 README.md                            | 5 +++++
 docker/docker/Dockerfile.linux.arm64 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7a507a0..3502803 100644
--- a/README.md
+++ b/README.md
@@ -73,6 +73,11 @@ docker run --rm \
   plugins/docker --dry-run
 ```
 
+## Developer Notes
+
+- When updating the base image, you will need to update for each architecture and OS.
+- Arm32 base images are no longer being updated.
+
 ## Release procedure
 
 Run the changelog generator.
diff --git a/docker/docker/Dockerfile.linux.arm64 b/docker/docker/Dockerfile.linux.arm64
index d12c4f8..fbb5f0b 100644
--- a/docker/docker/Dockerfile.linux.arm64
+++ b/docker/docker/Dockerfile.linux.arm64
@@ -1,4 +1,4 @@
-FROM arm64v8/docker:20.10.9-dind
+FROM arm64v8/docker:20.10.14-dind
 
 ENV DOCKER_HOST=unix:///var/run/docker.sock