Skip to content

Commit fe2102a

Browse files
authored
Move away from using quay.io for default images (#2805)
1 parent b3cd937 commit fe2102a

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
package org.testcontainers.utility;
22

33
import com.google.common.annotations.VisibleForTesting;
4-
import lombok.*;
4+
import lombok.AccessLevel;
5+
import lombok.Data;
6+
import lombok.Getter;
7+
import lombok.NonNull;
8+
import lombok.RequiredArgsConstructor;
9+
import lombok.SneakyThrows;
10+
import lombok.Synchronized;
511
import lombok.extern.slf4j.Slf4j;
612
import org.testcontainers.UnstableAPI;
713

8-
import java.io.*;
14+
import java.io.File;
15+
import java.io.FileNotFoundException;
16+
import java.io.FileOutputStream;
17+
import java.io.IOException;
18+
import java.io.InputStream;
19+
import java.io.OutputStream;
920
import java.net.MalformedURLException;
1021
import java.net.URL;
1122
import java.util.Objects;
@@ -56,7 +67,7 @@ public String getSocatContainerImage() {
5667
}
5768

5869
public String getVncRecordedContainerImage() {
59-
return (String) properties.getOrDefault("vncrecorder.container.image", "quay.io/testcontainers/vnc-recorder:1.1.0");
70+
return (String) properties.getOrDefault("vncrecorder.container.image", "testcontainersofficial/vnc-recorder:1.1.0");
6071
}
6172

6273
public String getDockerComposeContainerImage() {
@@ -72,11 +83,11 @@ public boolean isRyukPrivileged() {
7283
}
7384

7485
public String getRyukImage() {
75-
return (String) properties.getOrDefault("ryuk.container.image", "quay.io/testcontainers/ryuk:0.2.3");
86+
return (String) properties.getOrDefault("ryuk.container.image", "testcontainersofficial/ryuk:0.3.0");
7687
}
7788

7889
public String getSSHdImage() {
79-
return (String) properties.getOrDefault("sshd.container.image", "quay.io/testcontainers/sshd:1.0.0");
90+
return (String) properties.getOrDefault("sshd.container.image", "testcontainersofficial/sshd:1.0.0");
8091
}
8192

8293
public Integer getRyukTimeout() {

docs/features/configuration.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
3232
> **tinyimage.container.image = alpine:3.5**
3333
> Used by Testcontainers' core
3434
35-
> **vncrecorder.container.image = quay.io/testcontainers/vnc-recorder:1.1.0**
35+
> **vncrecorder.container.image = testcontainersofficial/vnc-recorder:1.1.0**
3636
> Used by VNC recorder in Testcontainers' Seleniun integration
3737
3838
> **ambassador.container.image = richnorth/ambassador:latest**
@@ -49,13 +49,11 @@ Another possibility is to set up a registry mirror in your environment so that a
4949
For more information, see the [official Docker documentation about "Registry as a pull through cache"](https://docs.docker.com/registry/recipes/mirror/).
5050

5151
!!!tip
52-
Registry mirror currently only works for Docker images with image name that has no registry specified (for example, for Docker image `mariadb:10.3.6`, it works, for Docker image `quay.io/testcontainers/ryuk:0.2.3`, not).
53-
Workaround is to to configure the affected Docker image in `.testcontainers.properties`.
54-
For example: `ryuk.container.image = testcontainers/ryuk:0.2.3` or `ryuk.container.image = <your.docker.registry>/testcontainers/ryuk:0.2.3`
52+
Registry mirror currently only works for Docker images with image name that has no registry specified (for example, for Docker image `mariadb:10.3.6`, it works, for Docker image `quay.io/something/else`, not).
5553

5654
## Customizing Ryuk resource reaper
5755

58-
> **ryuk.container.image = quay.io/testcontainers/ryuk:0.2.3**
56+
> **ryuk.container.image = testcontainersofficial/ryuk:0.3.0**
5957
> The resource reaper is responsible for container removal and automatic cleanup of dead containers at JVM shutdown
6058
6159
> **ryuk.container.privileged = false**

0 commit comments

Comments
 (0)