Skip to content

Commit e03ddd5

Browse files
cristianrgrecocristianrgreco
committed
Merge branch 'main' into release-11.0.0
2 parents 21ec355 + ea80400 commit e03ddd5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+206
-124
lines changed

‎docs/configuration.md‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@ Configuration of the Docker daemon:
3232

3333
Configuration of Testcontainers and its behaviours:
3434

35-
| Variable | Example | Description |
36-
| ------------------------------------- | -------------------------- | ---------------------------------------- |
37-
| TESTCONTAINERS_HOST_OVERRIDE | tcp://docker:2375 | Docker's host on which ports are exposed |
38-
| TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE | /var/run/docker.sock | Path to Docker's socket used by ryuk |
39-
| TESTCONTAINERS_RYUK_PRIVILEGED | true | Run ryuk as a privileged container |
40-
| TESTCONTAINERS_RYUK_DISABLED | true | Disable ryuk |
41-
| TESTCONTAINERS_RYUK_PORT | 65515 | Set ryuk host port (not recommended) |
42-
| TESTCONTAINERS_SSHD_PORT | 65515 | Set SSHd host port (not recommended) |
43-
| TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX | mycompany.com/registry | Set default image registry |
44-
| RYUK_CONTAINER_IMAGE | testcontainers/ryuk:0.11.0 | Custom image for ryuk |
45-
| SSHD_CONTAINER_IMAGE | testcontainers/sshd:1.1.0 | Custom image for SSHd |
46-
| TESTCONTAINERS_REUSE_ENABLE | true | Enable reusable containers |
35+
| Variable | Example | Description |
36+
| ------------------------------------- | -------------------------- | -------------------------------------------- |
37+
| TESTCONTAINERS_HOST_OVERRIDE | tcp://docker:2375 | Docker's host on which ports are exposed |
38+
| TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE | /var/run/docker.sock | Path to Docker's socket used by ryuk |
39+
| TESTCONTAINERS_RYUK_PRIVILEGED | true | Run ryuk as a privileged container |
40+
| TESTCONTAINERS_RYUK_DISABLED | true | Disable ryuk |
41+
| TESTCONTAINERS_RYUK_PORT | 65515 | Set ryuk host port (not recommended) |
42+
| TESTCONTAINERS_SSHD_PORT | 65515 | Set SSHd host port (not recommended) |
43+
| TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX | mycompany.com/registry | Set default image registry |
44+
| RYUK_CONTAINER_IMAGE | testcontainers/ryuk:0.11.0 | Custom image for ryuk |
45+
| SSHD_CONTAINER_IMAGE | testcontainers/sshd:1.1.0 | Custom image for SSHd |
46+
| TESTCONTAINERS_REUSE_ENABLE | true | Enable reusable containers |
47+
| TESTCONTAINERS_RYUK_VERBOSE | true | Sets RYUK_VERBOSE env var in ryuk container |

‎package-lock.json‎

Lines changed: 79 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"devDependencies": {
2121
"@eslint/js": "^9.22.0",
2222
"@eslint/json": "^0.11.0",
23-
"@vitest/coverage-v8": "^3.0.9",
23+
"@vitest/coverage-v8": "v3.1.0-beta.1",
2424
"cross-env": "^7.0.3",
2525
"eslint": "^9.22.0",
2626
"eslint-config-prettier": "^10.1.1",
@@ -35,7 +35,7 @@
3535
"ts-node": "^10.9.2",
3636
"typescript": "^5.8.2",
3737
"typescript-eslint": "^8.26.1",
38-
"vitest": "^3.0.9"
38+
"vitest": "v3.1.0-beta.1"
3939
},
4040
"lint-staged": {
4141
"packages/**/*.ts": [

‎packages/modules/arangodb/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"homepage": "https://github.com/testcontainers/testcontainers-node#readme",
1313
"repository": {
1414
"type": "git",
15-
"url": "https://github.com/testcontainers/testcontainers-node"
15+
"url": "git+https://github.com/testcontainers/testcontainers-node.git"
1616
},
1717
"bugs": {
1818
"url": "https://github.com/testcontainers/testcontainers-node/issues"

‎packages/modules/azurecosmosdb/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"homepage": "https://github.com/testcontainers/testcontainers-node#readme",
1515
"repository": {
1616
"type": "git",
17-
"url": "https://github.com/testcontainers/testcontainers-node"
17+
"url": "git+https://github.com/testcontainers/testcontainers-node.git"
1818
},
1919
"bugs": {
2020
"url": "https://github.com/testcontainers/testcontainers-node/issues"

‎packages/modules/azurite/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"homepage": "https://github.com/testcontainers/testcontainers-node#readme",
1313
"repository": {
1414
"type": "git",
15-
"url": "https://github.com/testcontainers/testcontainers-node"
15+
"url": "git+https://github.com/testcontainers/testcontainers-node.git"
1616
},
1717
"bugs": {
1818
"url": "https://github.com/testcontainers/testcontainers-node/issues"

‎packages/modules/cassandra/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"homepage": "https://github.com/testcontainers/testcontainers-node#readme",
1313
"repository": {
1414
"type": "git",
15-
"url": "https://github.com/testcontainers/testcontainers-node"
15+
"url": "git+https://github.com/testcontainers/testcontainers-node.git"
1616
},
1717
"bugs": {
1818
"url": "https://github.com/testcontainers/testcontainers-node/issues"

‎packages/modules/cassandra/src/cassandra-container.ts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AbstractStartedContainer, GenericContainer, type StartedTestContainer } from "testcontainers";
1+
import { AbstractStartedContainer, GenericContainer, Wait, type StartedTestContainer } from "testcontainers";
22

33
const CASSANDRA_PORT = 9042;
44

@@ -10,7 +10,7 @@ export class CassandraContainer extends GenericContainer {
1010

1111
constructor(image: string) {
1212
super(image);
13-
this.withExposedPorts(CASSANDRA_PORT).withStartupTimeout(120_000);
13+
this.withExposedPorts(CASSANDRA_PORT).withWaitStrategy(Wait.forHealthCheck()).withStartupTimeout(120_000);
1414
}
1515

1616
public withDatacenter(dc: string): this {
@@ -44,7 +44,20 @@ export class CassandraContainer extends GenericContainer {
4444
CASSANDRA_PASSWORD: this.password,
4545
CASSANDRA_SNITCH: "GossipingPropertyFileSnitch",
4646
CASSANDRA_ENDPOINT_SNITCH: "GossipingPropertyFileSnitch",
47+
CASSANDRA_NUM_TOKENS: "1",
48+
JVM_EXTRA_OPTS: "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0",
4749
});
50+
if (!this.healthCheck) {
51+
this.withHealthCheck({
52+
test: [
53+
"CMD-SHELL",
54+
`cqlsh -u ${this.username} -p ${this.password} -e "SELECT release_version FROM system.local;"`,
55+
],
56+
interval: 250,
57+
timeout: 1000,
58+
retries: 1000,
59+
});
60+
}
4861
return new StartedCassandraContainer(await super.start(), this.dc, this.rack, this.username, this.password);
4962
}
5063
}

‎packages/modules/chromadb/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"homepage": "https://github.com/testcontainers/testcontainers-node#readme",
1313
"repository": {
1414
"type": "git",
15-
"url": "https://github.com/testcontainers/testcontainers-node"
15+
"url": "git+https://github.com/testcontainers/testcontainers-node.git"
1616
},
1717
"bugs": {
1818
"url": "https://github.com/testcontainers/testcontainers-node/issues"

0 commit comments

Comments
 (0)