Skip to content

Commit 11c1161

Browse files
committed
[releng] Use a better tinyproxy container in tests
'vimagick/tinyproxy' is adm64-only and doesn't work under emulation on an ARM-based Mac. Use 'ajoergensen/tinyproxy' instead, which is a multi-architecture container.
1 parent aa9c94b commit 11c1161

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

sshd-test/src/test/java/org/apache/sshd/client/proxy/ProxyHttpAuthIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ProxyHttpAuthIntegrationTest extends AbstractContainerTestBase {
5454

5555
private static final Logger LOG = LoggerFactory.getLogger(ProxyHttpAuthIntegrationTest.class);
5656

57-
private static GenericContainer<?> proxy = new GenericContainer<>("vimagick/tinyproxy") //
57+
private static GenericContainer<?> proxy = new GenericContainer<>("ajoergensen/tinyproxy") //
5858
.withCopyFileToContainer(MountableFile.forClasspathResource("org/apache/sshd/proxy/tinyproxy-auth.conf"),
5959
"/etc/tinyproxy/tinyproxy.conf") //
6060
.withExposedPorts(1080) //

sshd-test/src/test/java/org/apache/sshd/client/proxy/ProxyHttpIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ProxyHttpIntegrationTest extends AbstractContainerTestBase {
4848

4949
private static final Logger LOG = LoggerFactory.getLogger(ProxyHttpIntegrationTest.class);
5050

51-
private static GenericContainer<?> proxy = new GenericContainer<>("vimagick/tinyproxy") //
51+
private static GenericContainer<?> proxy = new GenericContainer<>("ajoergensen/tinyproxy") //
5252
.withCopyFileToContainer(MountableFile.forClasspathResource("org/apache/sshd/proxy/tinyproxy.conf"),
5353
"/etc/tinyproxy/tinyproxy.conf") //
5454
.withExposedPorts(1080) //

0 commit comments

Comments
 (0)