From 252c648b524a75f04567f78d0985437e23d49e02 Mon Sep 17 00:00:00 2001
From: Dmitriy Tverdiakov <dmitriy.tverdiakov@neo4j.com>
Date: Tue, 13 Dec 2022 17:11:14 +0000
Subject: [PATCH] Update Testkit tests Docker setup

This now works on Apple M1.
---
 testkit-tests/pom.xml                    | 2 +-
 testkit-tests/src/main/docker/Dockerfile | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/testkit-tests/pom.xml b/testkit-tests/pom.xml
index fd5d9ac09e..d7fefcef15 100644
--- a/testkit-tests/pom.xml
+++ b/testkit-tests/pom.xml
@@ -30,7 +30,7 @@
         <!-- Debug logging for backend messages. Empty string - off, Non-empty string - on. -->
         <testkit.debug.reqres></testkit.debug.reqres>
 
-        <docker-maven-plugin.version>0.36.1</docker-maven-plugin.version>
+        <docker-maven-plugin.version>0.40.2</docker-maven-plugin.version>
         <docker.showLogs>true</docker.showLogs>
     </properties>
 
diff --git a/testkit-tests/src/main/docker/Dockerfile b/testkit-tests/src/main/docker/Dockerfile
index 758c243460..f15f448ce3 100644
--- a/testkit-tests/src/main/docker/Dockerfile
+++ b/testkit-tests/src/main/docker/Dockerfile
@@ -7,9 +7,10 @@ RUN apt-get update && apt-get install -y \
       gnupg \
       lsb-release
 
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+RUN mkdir -p /etc/apt/keyrings \
+      && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 
-RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
+RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
       | tee /etc/apt/sources.list.d/docker.list > /dev/null
 
 RUN apt-get update && apt-get install -y \