testcontainers 7.22.1-beta.0 → 7.23.2

package/README.md

@@ -523,6 +523,16 @@ const environment = await new DockerComposeEnvironment(composeFilePath, composeF
   .up();
 ```
 
+Specify [profiles](https://docs.docker.com/compose/profiles/):
+
+```javascript
+const { DockerComposeEnvironment } = require("testcontainers");
+
+const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
+    .withProfiles("profile1", "profile2")
+    .up();
+```
+
 Specify not to re-create containers that are already running: 
 
 ```javascript

package/dist/docker/functions/image/build-image.js

@@ -23,7 +23,7 @@ const create_labels_1 = require("../create-labels");
 const buildImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Building image '${options.imageName.toString()}' with context '${options.context}'`);
-        const dockerIgnoreFiles = yield docker_ignore_1.findDockerIgnoreFiles(options.context);
+        const dockerIgnoreFiles = yield docker_ignore_1.findDockerIgnoreFiles(options.context, options.dockerfileName);
         const tarStream = tar_fs_1.default.pack(options.context, { ignore: (name) => dockerIgnoreFiles.has(slash_1.default(name)) });
         return new Promise((resolve) => dockerode_1.dockerode
             .buildImage(tarStream, {

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

@@ -18,6 +18,7 @@ const defaultDockerComposeOptions = (_a) => {
         log: false,
         cwd: options.filePath,
         config: options.files,
+        composeOptions: options.composeOptions,
         commandOptions: options.commandOptions,
         env: Object.assign(Object.assign(Object.assign({}, process.env), { COMPOSE_PROJECT_NAME: options.projectName }), env),
     };

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

@@ -4,5 +4,6 @@ export declare type DockerComposeOptions = {
     files: string | string[];
     projectName: string;
     commandOptions?: string[];
+    composeOptions?: string[];
     env?: Env;
 };

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

@@ -8,12 +8,14 @@ export declare class DockerComposeEnvironment {
     private projectName;
     private build;
     private recreate;
+    private profiles;
     private env;
     private waitStrategy;
     private startupTimeout;
     constructor(composeFilePath: string, composeFiles: string | string[], uuid?: Uuid);
     withBuild(): this;
     withEnv(key: EnvKey, value: EnvValue): this;
+    withProfiles(...profiles: string[]): this;
     withNoRecreate(): this;
     withWaitStrategy(containerName: string, waitStrategy: WaitStrategy): this;
     withStartupTimeout(startupTimeout: number): this;

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

@@ -30,6 +30,7 @@ class DockerComposeEnvironment {
     constructor(composeFilePath, composeFiles, uuid = new uuid_1.RandomUuid()) {
         this.build = false;
         this.recreate = true;
+        this.profiles = [];
         this.env = {};
         this.waitStrategy = {};
         this.startupTimeout = 60000;
@@ -45,6 +46,10 @@ class DockerComposeEnvironment {
         this.env[key] = value;
         return this;
     }
+    withProfiles(...profiles) {
+        this.profiles = profiles;
+        return this;
+    }
     withNoRecreate() {
         this.recreate = false;
         this.projectName = "testcontainers-node";
@@ -74,7 +79,12 @@ class DockerComposeEnvironment {
             if (!this.recreate) {
                 commandOptions.push("--no-recreate");
             }
-            yield docker_compose_up_1.dockerComposeUp(Object.assign(Object.assign({}, options), { commandOptions, env: this.env }), services);
+            const composeOptions = [];
+            this.profiles.forEach((profile) => {
+                composeOptions.push("--profile");
+                composeOptions.push(profile);
+            });
+            yield docker_compose_up_1.dockerComposeUp(Object.assign(Object.assign({}, options), { commandOptions, composeOptions, 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,
@@ -110,7 +120,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, options);
+            return new started_docker_compose_environment_1.StartedDockerComposeEnvironment(startedGenericContainers, Object.assign(Object.assign({}, options), { composeOptions, env: this.env }));
         });
     }
     getBoundPorts(containerInfo) {

package/dist/docker-ignore.d.ts

@@ -1 +1 @@
-export declare const findDockerIgnoreFiles: (context: string) => Promise<Set<string>>;
+export declare const findDockerIgnoreFiles: (context: string, dockerfileName: string) => Promise<Set<string>>;

package/dist/docker-ignore.js

@@ -17,7 +17,7 @@ const fs_1 = require("fs");
 const os_1 = __importDefault(require("os"));
 const glob_1 = __importDefault(require("glob"));
 const path_1 = __importDefault(require("path"));
-const findDockerIgnoreFiles = (context) => __awaiter(void 0, void 0, void 0, function* () {
+const findDockerIgnoreFiles = (context, dockerfileName) => __awaiter(void 0, void 0, void 0, function* () {
     const dockerIgnoreFilePath = path_1.default.join(context, ".dockerignore");
     if (!fs_1.existsSync(dockerIgnoreFilePath)) {
         return new Set();
@@ -25,6 +25,7 @@ const findDockerIgnoreFiles = (context) => __awaiter(void 0, void 0, void 0, fun
     const dockerIgnorePatterns = (yield fs_1.promises.readFile(dockerIgnoreFilePath, { encoding: "utf-8" }))
         .toString()
         .split(os_1.default.EOL)
+        .filter((dockerIgnorePattern) => dockerIgnorePattern !== dockerfileName)
         .map((dockerIgnorePattern) => path_1.default.resolve(context, dockerIgnorePattern));
     const dockerIgnoreMatches = (yield Promise.all(dockerIgnorePatterns.map(findIgnoredFilesForPattern))).reduce((prev, next) => [...prev, ...next]);
     return new Set(dockerIgnoreMatches);

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"], { shell: process.platform === "win32" });
+            const sink = child_process_1.spawn(providerName, ["get"]);
             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.1-beta.0",
+  "version": "7.23.2",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [