Skip to content

Commit 42f1afe

Browse files
cristianrgrecocristianrgreco
committed
Remove default images from modules
1 parent 898bbb2 commit 42f1afe

File tree

71 files changed

+357
-182
lines changed

Some content is hidden

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

71 files changed

+357
-182
lines changed

‎packages/modules/arangodb/src/arangodb-container.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { Database } from "arangojs";
22
import { ArangoDBContainer } from "./arangodb-container";
33

4+
const IMAGE = "arangodb:3.10.0";
5+
46
describe("ArangoDB", { timeout: 180_000 }, () => {
57
// connect {
68
it("should connect and return a query result", async () => {
7-
const container = await new ArangoDBContainer().start();
9+
const container = await new ArangoDBContainer(IMAGE).start();
810
const db = new Database({ url: container.getHttpUrl() });
911

1012
db.database("_system");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const USERNAME = "root";
55

66
export class ArangoDBContainer extends GenericContainer {
77
constructor(
8-
image = "arangodb:3.10.0",
8+
image: string,
99
private password = "test"
1010
) {
1111
super(image);

‎packages/modules/azurecosmosdb/src/azure-cosmosdb-emulator-container.test.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@ import * as https from "node:https";
33
import { expect } from "vitest";
44
import { AzureCosmosDbEmulatorContainer } from "./azure-cosmosdb-emulator-container";
55

6+
const IMAGE = "mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-EN20250228";
7+
68
describe("AzureCosmosDbEmulatorContainer", { timeout: 180_000 }, async () => {
79
it("should set https protocol", async () => {
8-
const container = await new AzureCosmosDbEmulatorContainer().withProtocol("https").start();
10+
const container = await new AzureCosmosDbEmulatorContainer(IMAGE).withProtocol("https").start();
911
const connectionUri = container.getConnectionUri();
1012
expect(connectionUri).toContain("AccountEndpoint=https://");
1113
await container.stop();
1214
});
1315
it("should set http protocol if no protocol is specified", async () => {
14-
const container = await new AzureCosmosDbEmulatorContainer().start();
16+
const container = await new AzureCosmosDbEmulatorContainer(IMAGE).start();
1517
const connectionUri = container.getConnectionUri();
1618
expect(connectionUri).toContain("AccountEndpoint=http://");
1719
await container.stop();
1820
});
1921

2022
// httpCreateDB {
2123
it("should be able to create a database using http", async () => {
22-
const container = await new AzureCosmosDbEmulatorContainer().withProtocol("http").start();
24+
const container = await new AzureCosmosDbEmulatorContainer(IMAGE).withProtocol("http").start();
2325
const cosmosClient = new CosmosClient({
2426
endpoint: container.getEndpoint(),
2527
key: container.getKey(),
@@ -40,7 +42,7 @@ describe("AzureCosmosDbEmulatorContainer", { timeout: 180_000 }, async () => {
4042

4143
// httpsCreateDB {
4244
it("should be able to create a database using https", async () => {
43-
const container = await new AzureCosmosDbEmulatorContainer().withProtocol("https").start();
45+
const container = await new AzureCosmosDbEmulatorContainer(IMAGE).withProtocol("https").start();
4446
const cosmosClient = new CosmosClient({
4547
endpoint: container.getEndpoint(),
4648
key: container.getKey(),
@@ -64,7 +66,7 @@ describe("AzureCosmosDbEmulatorContainer", { timeout: 180_000 }, async () => {
6466

6567
// createAndRead {
6668
it("should be able to create a container and store and retrieve items", async () => {
67-
const container = await new AzureCosmosDbEmulatorContainer().withProtocol("http").start();
69+
const container = await new AzureCosmosDbEmulatorContainer(IMAGE).withProtocol("http").start();
6870
const cosmosClient = new CosmosClient({
6971
endpoint: container.getEndpoint(),
7072
key: container.getKey(),

‎packages/modules/azurecosmosdb/src/azure-cosmosdb-emulator-container.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class AzureCosmosDbEmulatorContainer extends GenericContainer {
2222
private explorerEnabled = DEFAULT_EXPLORER_ENABLED;
2323
private portGenerator: PortGenerator;
2424

25-
constructor(image = "mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-EN20250228") {
25+
constructor(image: string) {
2626
super(image);
2727
this.portGenerator = new RandomUniquePortGenerator();
2828
this.withWaitStrategy(Wait.forLogMessage(COSMOS_READY_LOG_MESSAGE));

‎packages/modules/azurite/src/azurite-container.test.ts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ import { BlobServiceClient, StorageSharedKeyCredential } from "@azure/storage-bl
33
import { QueueServiceClient } from "@azure/storage-queue";
44
import { AzuriteContainer } from "./azurite-container";
55

6+
const IMAGE = "mcr.microsoft.com/azure-storage/azurite:3.33.0";
7+
68
describe("Azurite", { timeout: 240_000 }, () => {
79
// uploadAndDownloadBlob {
810
it("should upload and download blob with default credentials", async () => {
9-
const container = await new AzuriteContainer().start();
11+
const container = await new AzuriteContainer(IMAGE).start();
1012

1113
const connectionString = container.getConnectionString();
1214
expect(connectionString).toBeTruthy();
@@ -38,7 +40,7 @@ describe("Azurite", { timeout: 240_000 }, () => {
3840

3941
// sendAndReceiveQueue {
4042
it("should add to queue with default credentials", async () => {
41-
const container = await new AzuriteContainer().start();
43+
const container = await new AzuriteContainer(IMAGE).start();
4244

4345
const connectionString = container.getConnectionString();
4446
expect(connectionString).toBeTruthy();
@@ -62,7 +64,7 @@ describe("Azurite", { timeout: 240_000 }, () => {
6264

6365
// createAndInsertOnTable {
6466
it("should add to table with default credentials", async () => {
65-
const container = await new AzuriteContainer().start();
67+
const container = await new AzuriteContainer(IMAGE).start();
6668

6769
const connectionString = container.getConnectionString();
6870
expect(connectionString).toBeTruthy();
@@ -94,7 +96,7 @@ describe("Azurite", { timeout: 240_000 }, () => {
9496
// Account key must be base64 encoded
9597
const accountKey = Buffer.from("test-key").toString("base64");
9698

97-
const container = await new AzuriteContainer().withAccountName(accountName).withAccountKey(accountKey).start();
99+
const container = await new AzuriteContainer(IMAGE).withAccountName(accountName).withAccountKey(accountKey).start();
98100

99101
const credentials = new StorageSharedKeyCredential(accountName, accountKey);
100102
const serviceClient = new BlobServiceClient(container.getBlobEndpoint(), credentials);
@@ -116,7 +118,7 @@ describe("Azurite", { timeout: 240_000 }, () => {
116118
const blobPort = 13000;
117119
const queuePort = 14000;
118120
const tablePort = 15000;
119-
const container = await new AzuriteContainer()
121+
const container = await new AzuriteContainer(IMAGE)
120122
.withBlobPort({ container: 10001, host: blobPort })
121123
.withQueuePort({ container: 10002, host: queuePort })
122124
.withTablePort({ container: 10003, host: tablePort })
@@ -141,7 +143,7 @@ describe("Azurite", { timeout: 240_000 }, () => {
141143

142144
// inMemoryPersistence {
143145
it("should be able to use in-memory persistence", async () => {
144-
const container = await new AzuriteContainer().withInMemoryPersistence().start();
146+
const container = await new AzuriteContainer(IMAGE).withInMemoryPersistence().start();
145147
const blobName = "hello.txt";
146148

147149
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ import {
77
Wait,
88
} from "testcontainers";
99

10-
const AZURITE_IMAGE = "mcr.microsoft.com/azure-storage/azurite:3.33.0";
1110
const BLOB_PORT = 10000;
1211
const QUEUE_PORT = 10001;
1312
const TABLE_PORT = 10002;
1413
const DEFAULT_ACCOUNT_NAME = "devstoreaccount1";
1514
const DEFAULT_ACCOUNT_KEY = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
1615

1716
export class AzuriteContainer extends GenericContainer {
18-
constructor(image = AZURITE_IMAGE) {
17+
constructor(image: string) {
1918
super(image);
2019
this.withEntrypoint(["azurite"])
2120
.withWaitStrategy(

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { Client } from "cassandra-driver";
22
import { CassandraContainer } from "./cassandra-container";
33

4+
const IMAGE = "cassandra:5.0.2";
5+
46
describe("Cassandra", { timeout: 240_000 }, () => {
57
// connectWithDefaultCredentials {
68
it("should connect and execute a query with default credentials", async () => {
7-
const container = await new CassandraContainer("cassandra:5.0.2").start();
9+
const container = await new CassandraContainer(IMAGE).start();
810

911
const client = new Client({
1012
contactPoints: [container.getContactPoint()],
@@ -27,7 +29,7 @@ describe("Cassandra", { timeout: 240_000 }, () => {
2729
const username = "testUser";
2830
const password = "testPassword";
2931

30-
const container = await new CassandraContainer().withUsername(username).withPassword(password).start();
32+
const container = await new CassandraContainer(IMAGE).withUsername(username).withPassword(password).start();
3133

3234
const client = new Client({
3335
contactPoints: [container.getContactPoint()],
@@ -50,7 +52,7 @@ describe("Cassandra", { timeout: 240_000 }, () => {
5052
it("should set datacenter and rack", async () => {
5153
const customDataCenter = "customDC";
5254
const customRack = "customRack";
53-
const container = await new CassandraContainer().withDatacenter(customDataCenter).withRack(customRack).start();
55+
const container = await new CassandraContainer(IMAGE).withDatacenter(customDataCenter).withRack(customRack).start();
5456

5557
const client = new Client({
5658
contactPoints: [container.getContactPoint()],
@@ -69,7 +71,7 @@ describe("Cassandra", { timeout: 240_000 }, () => {
6971

7072
// createAndFetchData {
7173
it("should create keyspace, a table, insert data, and retrieve it", async () => {
72-
const container = await new CassandraContainer().start();
74+
const container = await new CassandraContainer(IMAGE).start();
7375

7476
const client = new Client({
7577
contactPoints: [container.getContactPoint()],
@@ -109,7 +111,7 @@ describe("Cassandra", { timeout: 240_000 }, () => {
109111
// }
110112

111113
it("should work with restarted container", async () => {
112-
const container = await new CassandraContainer("cassandra:5.0.2").start();
114+
const container = await new CassandraContainer(IMAGE).start();
113115
await container.restart();
114116

115117
const client = new Client({

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export class CassandraContainer extends GenericContainer {
88
private username = "cassandra";
99
private password = "cassandra";
1010

11-
constructor(image = "cassandra:5.0.2") {
11+
constructor(image: string) {
1212
super(image);
1313
this.withExposedPorts(CASSANDRA_PORT).withStartupTimeout(120_000);
1414
}

‎packages/modules/chromadb/src/chromadb-container.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { AdminClient, ChromaClient } from "chromadb";
22
import { ChromaDBContainer } from "./chromadb-container";
33

4+
const IMAGE = "chromadb/chroma:0.4.24";
5+
46
describe("ChromaDB", { timeout: 360_000 }, () => {
57
// docs {
68
it("should connect and return a query result", async () => {
7-
const container = await new ChromaDBContainer().start();
9+
const container = await new ChromaDBContainer(IMAGE).start();
810
const tenant = "test-tenant";
911
const key = "test-key";
1012
const database = "test-db";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { AbstractStartedContainer, GenericContainer, StartedTestContainer, Wait
33
const CHROMADB_PORT = 8000;
44

55
export class ChromaDBContainer extends GenericContainer {
6-
constructor(image = "chromadb/chroma:0.4.24") {
6+
constructor(image: string) {
77
super(image);
88
this.withExposedPorts(CHROMADB_PORT)
99
.withWaitStrategy(Wait.forHttp("/api/v1/heartbeat", CHROMADB_PORT))

0 commit comments

Comments
 (0)