testcontainers 9.4.0 → 9.5.0

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "testcontainers",
     "author": "Cristian Greco",
-    "version": "9.4.0",
+    "version": "9.5.0",
     "main": "dist/src/index",
     "types": "dist/src/index",
     "keywords": [

package/dist/src/docker/rootless-unix-socket-strategy.d.ts

@@ -8,7 +8,8 @@ export declare class RootlessUnixSocketStrategy implements DockerClientStrategy
     constructor(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv);
     init(): Promise<void>;
     private getSocketPathFromEnv;
-    private getSocketPathFromHomeDir;
+    private getSocketPathFromHomeRunDir;
+    private getSocketPathFromHomeDesktopDir;
     private getSocketPathFromRunDir;
     getDockerClient(): Promise<DockerClientInit>;
     isApplicable(): boolean;

package/dist/src/docker/rootless-unix-socket-strategy.js

@@ -29,7 +29,12 @@ class RootlessUnixSocketStrategy {
                 this.applicable = false;
                 return;
             }
-            this.socketPath = [this.getSocketPathFromEnv(), this.getSocketPathFromHomeDir(), this.getSocketPathFromRunDir()]
+            this.socketPath = [
+                this.getSocketPathFromEnv(),
+                this.getSocketPathFromHomeRunDir(),
+                this.getSocketPathFromHomeDesktopDir(),
+                this.getSocketPathFromRunDir(),
+            ]
                 .filter(type_guards_1.isDefined)
                 .find((candidateSocketPath) => (0, fs_1.existsSync)(candidateSocketPath));
             this.applicable = this.socketPath !== undefined;
@@ -44,9 +49,12 @@ class RootlessUnixSocketStrategy {
             return undefined;
         }
     }
-    getSocketPathFromHomeDir() {
+    getSocketPathFromHomeRunDir() {
         return path_1.default.join(os_1.default.homedir(), ".docker", "run", "docker.sock");
     }
+    getSocketPathFromHomeDesktopDir() {
+        return path_1.default.join(os_1.default.homedir(), ".docker", "desktop", "docker.sock");
+    }
     getSocketPathFromRunDir() {
         return path_1.default.join("/run", "user", `${os_1.default.userInfo().uid}`, "docker.sock");
     }

package/dist/src/docker-compose/functions/docker-compose-pull.d.ts

@@ -0,0 +1,2 @@
+import { DockerComposeOptions } from "../docker-compose-options";
+export declare const dockerComposePull: (options: DockerComposeOptions, services?: Array<string>) => Promise<void>;

package/dist/src/docker-compose/functions/docker-compose-pull.js

@@ -0,0 +1,35 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dockerComposePull = void 0;
+const logger_1 = require("../../logger");
+const docker_compose_1 = require("docker-compose");
+const default_docker_compose_options_1 = require("../default-docker-compose-options");
+const dockerComposePull = (options, services) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        if (services) {
+            logger_1.log.info(`Pulling DockerCompose environment images for ${services.join(", ")}`);
+            yield (0, docker_compose_1.pullMany)(services, yield (0, default_docker_compose_options_1.defaultDockerComposeOptions)(options));
+        }
+        else {
+            logger_1.log.info(`Pulling DockerCompose environment images`);
+            yield (0, docker_compose_1.pullAll)(yield (0, default_docker_compose_options_1.defaultDockerComposeOptions)(options));
+        }
+        logger_1.log.info(`Pulled DockerCompose environment`);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    }
+    catch (err) {
+        const errorMessage = err.err || err.message || err || "";
+        logger_1.log.error(`Failed to pull DockerCompose environment images: ${errorMessage.trim()}`);
+        throw new Error(errorMessage);
+    }
+});
+exports.dockerComposePull = dockerComposePull;

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

@@ -2,6 +2,7 @@ import { WaitStrategy } from "../wait-strategy/wait-strategy";
 import { Uuid } from "../uuid";
 import { Environment } from "../docker/types";
 import { StartedDockerComposeEnvironment } from "./started-docker-compose-environment";
+import { PullPolicy } from "../pull-policy";
 export declare class DockerComposeEnvironment {
     private readonly composeFilePath;
     private readonly composeFiles;
@@ -11,6 +12,7 @@ export declare class DockerComposeEnvironment {
     private environmentFile;
     private profiles;
     private environment;
+    private pullPolicy;
     private waitStrategy;
     private startupTimeout;
     constructor(composeFilePath: string, composeFiles: string | string[], uuid?: Uuid);
@@ -19,6 +21,7 @@ export declare class DockerComposeEnvironment {
     withEnvironmentFile(environmentFile: string): this;
     withProfiles(...profiles: string[]): this;
     withNoRecreate(): this;
+    withPullPolicy(pullPolicy: PullPolicy): this;
     withWaitStrategy(containerName: string, waitStrategy: WaitStrategy): this;
     withStartupTimeout(startupTimeout: number): this;
     up(services?: Array<string>): Promise<StartedDockerComposeEnvironment>;

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

@@ -26,6 +26,8 @@ const docker_compose_down_1 = require("../docker-compose/functions/docker-compos
 const docker_compose_up_1 = require("../docker-compose/functions/docker-compose-up");
 const wait_for_container_1 = require("../wait-for-container");
 const default_wait_strategy_1 = require("../wait-strategy/default-wait-strategy");
+const pull_policy_1 = require("../pull-policy");
+const docker_compose_pull_1 = require("../docker-compose/functions/docker-compose-pull");
 class DockerComposeEnvironment {
     constructor(composeFilePath, composeFiles, uuid = new uuid_1.RandomUuid()) {
         this.build = false;
@@ -33,6 +35,7 @@ class DockerComposeEnvironment {
         this.environmentFile = "";
         this.profiles = [];
         this.environment = {};
+        this.pullPolicy = new pull_policy_1.DefaultPullPolicy();
         this.waitStrategy = {};
         this.startupTimeout = 60000;
         this.composeFilePath = composeFilePath;
@@ -60,6 +63,10 @@ class DockerComposeEnvironment {
         this.projectName = "testcontainers-node";
         return this;
     }
+    withPullPolicy(pullPolicy) {
+        this.pullPolicy = pullPolicy;
+        return this;
+    }
     withWaitStrategy(containerName, waitStrategy) {
         this.waitStrategy[containerName] = waitStrategy;
         return this;
@@ -89,6 +96,9 @@ class DockerComposeEnvironment {
                 composeOptions.push("--env-file", this.environmentFile);
             }
             this.profiles.forEach((profile) => composeOptions.push("--profile", profile));
+            if (this.pullPolicy.shouldPull()) {
+                yield (0, docker_compose_pull_1.dockerComposePull)(options, services);
+            }
             yield (0, docker_compose_up_1.dockerComposeUp)(Object.assign(Object.assign({}, options), { commandOptions, composeOptions, environment: this.environment }), services);
             const startedContainers = (yield (0, list_containers_1.listContainers)()).filter((container) => container.Labels["com.docker.compose.project"] === this.projectName);
             const startedContainerNames = startedContainers.reduce((containerNames, startedContainer) => [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "9.4.0",
+  "version": "9.5.0",
   "main": "dist/src/index",
   "types": "dist/src/index",
   "keywords": [