testcontainers 7.22.0 → 7.22.1-beta.0

package/dist/docker-compose/default-docker-compose-options.js

@@ -12,7 +12,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultDockerComposeOptions = void 0;
-const session_id_1 = require("../docker/session-id");
 const defaultDockerComposeOptions = (_a) => {
     var { env = {} } = _a, options = __rest(_a, ["env"]);
     return {
@@ -20,7 +19,7 @@ const defaultDockerComposeOptions = (_a) => {
         cwd: options.filePath,
         config: options.files,
         commandOptions: options.commandOptions,
-        env: Object.assign(Object.assign(Object.assign({}, process.env), { COMPOSE_PROJECT_NAME: session_id_1.sessionId }), env),
+        env: Object.assign(Object.assign(Object.assign({}, process.env), { COMPOSE_PROJECT_NAME: options.projectName }), env),
     };
 };
 exports.defaultDockerComposeOptions = defaultDockerComposeOptions;

package/dist/docker-compose/docker-compose-options.d.ts

@@ -2,6 +2,7 @@ import { Env } from "../docker/types";
 export declare type DockerComposeOptions = {
     filePath: string;
     files: string | string[];
+    projectName: string;
     commandOptions?: string[];
     env?: Env;
 };

package/dist/docker-compose/functions/container-name-resolver.d.ts

@@ -1 +1 @@
-export declare const resolveContainerName: (containerName: string) => string;
+export declare const resolveContainerName: (projectName: string, containerName: string) => string;

package/dist/docker-compose/functions/container-name-resolver.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveContainerName = void 0;
-const session_id_1 = require("../../docker/session-id");
-const resolveContainerName = (containerName) => {
-    if (containerName.includes(session_id_1.sessionId)) {
-        return containerName.substring(`/${session_id_1.sessionId}_`.length);
+const resolveContainerName = (projectName, containerName) => {
+    if (containerName.includes(projectName)) {
+        return containerName.substring(`/${projectName}_`.length);
     }
     else if (containerName.startsWith("/")) {
         return containerName.substring(1);
     }
     else {
-        throw new Error(`Unable to resolve container name for container name: "${containerName}", session ID: "${session_id_1.sessionId}"`);
+        throw new Error(`Unable to resolve container name for container name: "${containerName}", project name: "${projectName}"`);
     }
 };
 exports.resolveContainerName = resolveContainerName;

package/dist/docker-compose-environment/docker-compose-environment.d.ts

@@ -1,14 +1,17 @@
 import { WaitStrategy } from "../wait-strategy";
+import { Uuid } from "../uuid";
 import { EnvKey, EnvValue } from "../docker/types";
 import { StartedDockerComposeEnvironment } from "./started-docker-compose-environment";
 export declare class DockerComposeEnvironment {
-    private readonly options;
+    private readonly composeFilePath;
+    private readonly composeFiles;
+    private projectName;
     private build;
     private recreate;
     private env;
     private waitStrategy;
     private startupTimeout;
-    constructor(composeFilePath: string, composeFiles: string | string[]);
+    constructor(composeFilePath: string, composeFiles: string | string[], uuid?: Uuid);
     withBuild(): this;
     withEnv(key: EnvKey, value: EnvValue): this;
     withNoRecreate(): this;

package/dist/docker-compose-environment/docker-compose-environment.js

@@ -17,6 +17,7 @@ const logger_1 = require("../logger");
 const port_check_1 = require("../port-check");
 const wait_strategy_1 = require("../wait-strategy");
 const reaper_1 = require("../reaper");
+const uuid_1 = require("../uuid");
 const list_containers_1 = require("../docker/functions/container/list-containers");
 const get_container_1 = require("../docker/functions/container/get-container");
 const docker_host_1 = require("../docker/docker-host");
@@ -25,15 +26,16 @@ const container_logs_1 = require("../docker/functions/container/container-logs")
 const started_docker_compose_environment_1 = require("./started-docker-compose-environment");
 const docker_compose_down_1 = require("../docker-compose/functions/docker-compose-down");
 const docker_compose_up_1 = require("../docker-compose/functions/docker-compose-up");
-const session_id_1 = require("../docker/session-id");
 class DockerComposeEnvironment {
-    constructor(composeFilePath, composeFiles) {
+    constructor(composeFilePath, composeFiles, uuid = new uuid_1.RandomUuid()) {
         this.build = false;
         this.recreate = true;
         this.env = {};
         this.waitStrategy = {};
         this.startupTimeout = 60000;
-        this.options = { filePath: composeFilePath, files: composeFiles };
+        this.composeFilePath = composeFilePath;
+        this.composeFiles = composeFiles;
+        this.projectName = `testcontainers-${uuid.nextUuid()}`;
     }
     withBuild() {
         this.build = true;
@@ -45,6 +47,7 @@ class DockerComposeEnvironment {
     }
     withNoRecreate() {
         this.recreate = false;
+        this.projectName = "testcontainers-node";
         return this;
     }
     withWaitStrategy(containerName, waitStrategy) {
@@ -57,8 +60,13 @@ class DockerComposeEnvironment {
     }
     up(services) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.log.info(`Starting DockerCompose environment`);
-            yield reaper_1.ReaperInstance.getInstance();
+            logger_1.log.info(`Starting DockerCompose environment: ${this.projectName}`);
+            (yield reaper_1.ReaperInstance.getInstance()).addProject(this.projectName);
+            const options = {
+                filePath: this.composeFilePath,
+                files: this.composeFiles,
+                projectName: this.projectName,
+            };
             const commandOptions = [];
             if (this.build) {
                 commandOptions.push("--build");
@@ -66,8 +74,8 @@ class DockerComposeEnvironment {
             if (!this.recreate) {
                 commandOptions.push("--no-recreate");
             }
-            yield docker_compose_up_1.dockerComposeUp(Object.assign(Object.assign({}, this.options), { commandOptions, env: this.env }), services);
-            const startedContainers = (yield list_containers_1.listContainers()).filter((container) => container.Labels["com.docker.compose.project"] === session_id_1.sessionId);
+            yield docker_compose_up_1.dockerComposeUp(Object.assign(Object.assign({}, options), { commandOptions, env: this.env }), services);
+            const startedContainers = (yield list_containers_1.listContainers()).filter((container) => container.Labels["com.docker.compose.project"] === this.projectName);
             const startedContainerNames = startedContainers.reduce((containerNames, startedContainer) => [
                 ...containerNames,
                 startedContainer.Names.join(", "),
@@ -75,7 +83,7 @@ class DockerComposeEnvironment {
             logger_1.log.info(`Started the following containers: ${startedContainerNames.join(", ")}`);
             const startedGenericContainers = (yield Promise.all(startedContainers.map((startedContainer) => __awaiter(this, void 0, void 0, function* () {
                 const container = get_container_1.getContainerById(startedContainer.Id);
-                const containerName = container_name_resolver_1.resolveContainerName(startedContainer.Names[0]);
+                const containerName = container_name_resolver_1.resolveContainerName(this.projectName, startedContainer.Names[0]);
                 (yield container_logs_1.containerLogs(container))
                     .on("data", (data) => logger_1.containerLog.trace(`${containerName}: ${data}`))
                     .on("err", (data) => logger_1.containerLog.error(`${containerName}: ${data}`));
@@ -89,7 +97,7 @@ class DockerComposeEnvironment {
                 catch (err) {
                     logger_1.log.error(`Container ${containerName} failed to be ready: ${err}`);
                     try {
-                        yield docker_compose_down_1.dockerComposeDown(this.options);
+                        yield docker_compose_down_1.dockerComposeDown(options);
                     }
                     catch (_a) {
                         logger_1.log.warn(`Failed to stop DockerCompose environment after failed up`);
@@ -102,7 +110,7 @@ class DockerComposeEnvironment {
                 return Object.assign(Object.assign({}, map), { [containerName]: startedGenericContainer });
             }, {});
             logger_1.log.info(`DockerCompose environment started: ${Object.keys(startedGenericContainers).join(", ")}`);
-            return new started_docker_compose_environment_1.StartedDockerComposeEnvironment(startedGenericContainers, this.options);
+            return new started_docker_compose_environment_1.StartedDockerComposeEnvironment(startedGenericContainers, options);
         });
     }
     getBoundPorts(containerInfo) {

package/dist/reaper.d.ts

@@ -1,4 +1,5 @@
 export interface Reaper {
+    addProject(projectName: string): void;
     getContainerId(): string;
     stop(): void;
 }

package/dist/reaper.js

@@ -21,6 +21,9 @@ class RealReaper {
         this.container = container;
         this.socket = socket;
     }
+    addProject(projectName) {
+        this.socket.write(`label=com.docker.compose.project=${projectName}\r\n`);
+    }
     getContainerId() {
         return this.container.getId();
     }
@@ -29,6 +32,9 @@ class RealReaper {
     }
 }
 class DisabledReaper {
+    addProject() {
+        // noop
+    }
     stop() {
         // noop
     }
@@ -97,7 +103,6 @@ class ReaperInstance {
                 socket.connect(port, host, () => {
                     logger_1.log.debug(`Connected to Reaper ${container.getId()}`);
                     socket.write(`label=org.testcontainers.session-id=${session_id_1.sessionId}\r\n`);
-                    socket.write(`label=com.docker.compose.project=${session_id_1.sessionId}\r\n`);
                     const reaper = new RealReaper(container, socket);
                     resolve(reaper);
                 });

package/dist/registry-auth-locator/credential-provider.js

@@ -55,7 +55,7 @@ class CredentialProvider {
     }
     runCredentialProvider(registry, providerName) {
         return new Promise((resolve) => {
-            const sink = child_process_1.spawn(providerName, ["get"]);
+            const sink = child_process_1.spawn(providerName, ["get"], { shell: process.platform === "win32" });
             const chunks = [];
             sink.stdout.on("data", (chunk) => chunks.push(chunk));
             sink.on("close", (code) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "7.22.0",
+  "version": "7.22.1-beta.0",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [