Skip to content

Commit 3d63575

Browse files
committed
Update Testkit tests Docker setup
One notable benefit is that this works on Apple M1.
1 parent 7519388 commit 3d63575

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

testkit-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<!-- Debug logging for backend messages. Empty string - off, Non-empty string - on. -->
3131
<testkit.debug.reqres></testkit.debug.reqres>
3232

33-
<docker-maven-plugin.version>0.36.1</docker-maven-plugin.version>
33+
<docker-maven-plugin.version>0.40.2</docker-maven-plugin.version>
3434
<docker.showLogs>true</docker.showLogs>
3535
</properties>
3636

testkit-tests/src/main/docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
FROM python:3.10.0b4-buster
22

33
RUN apt-get update && apt-get install -y \
4-
apt-transport-https \
54
ca-certificates \
65
curl \
76
gnupg \
87
lsb-release
98

10-
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
9+
RUN mkdir -p /etc/apt/keyrings \
10+
&& curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
1111

12-
RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
12+
RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
1313
| tee /etc/apt/sources.list.d/docker.list > /dev/null
1414

1515
RUN apt-get update && apt-get install -y \

0 commit comments

Comments
 (0)