Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use sshd container 1.1.0 #5486

Merged
merged 5 commits into from
Jun 22, 2022
Merged

Use sshd container 1.1.0 #5486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2c7f13
Use sshd container 1.1.0
jerrinot Jun 12, 2022
dec40ec
Typo fixed
jerrinot Jun 13, 2022
93f9b83
Make the formatting overlords happy :)
jerrinot Jun 13, 2022
fb4a277
Merge branch 'master' into fixed/upgrade-sshd-container--1.1.0
eddumelendez Jun 16, 2022
143ac5b
Merge branch 'master' into fixed/upgrade-sshd-container--1.1.0
eddumelendez Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,17 @@ public enum PortForwardingContainer {
private Connection createSSHSession() {
String password = UUID.randomUUID().toString();
container =
new GenericContainer<>(DockerImageName.parse("testcontainers/sshd:1.0.0"))
new GenericContainer<>(DockerImageName.parse("testcontainers/sshd:1.1.0"))
.withExposedPorts(22)
.withEnv("PASSWORD", password)
.withCommand(
"sh",
"-c",
// Disable ipv6 & Make it listen on all interfaces, not just localhost
"echo \"root:$PASSWORD\" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes -o AddressFamily=inet -o GatewayPorts=yes"
// Enable algorithms supported by our ssh client library
"echo \"root:$PASSWORD\" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes " +
"-o AddressFamily=inet -o GatewayPorts=yes -o AllowAgentForwarding=yes -o AllowTcpForwarding=yes " +
"-o KexAlgorithms=+diffie-hellman-group1-sha1 -o HostkeyAlgorithms=+ssh-rsa "
);
container.start();

Expand Down
2 changes: 1 addition & 1 deletion docs/features/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
> **tinyimage.container.image = alpine:3.14**
> Used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](#disabling-the-startup-checks))

> **sshd.container.image = testcontainers/sshd:1.0.0**
> **sshd.container.image = testcontainers/sshd:1.1.0**
> Required if [exposing host ports to containers](./networking.md#exposing-host-ports-to-the-container)

> **vncrecorder.container.image = testcontainers/vnc-recorder:1.1.0**
Expand Down