testcontainers 8.5.1 → 8.6.0

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

@@ -14,17 +14,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildImage = void 0;
 const logger_1 = require("../../../logger");
-const docker_ignore_1 = require("../../../docker-ignore");
 const tar_fs_1 = __importDefault(require("tar-fs"));
-const slash_1 = __importDefault(require("slash"));
 const byline_1 = __importDefault(require("byline"));
 const docker_client_1 = require("../../docker-client");
 const create_labels_1 = require("../create-labels");
+const path_1 = __importDefault(require("path"));
+const fs_1 = require("fs");
+const dockerignore_1 = __importDefault(require("@balena/dockerignore"));
 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, options.dockerfileName);
-        const tarStream = tar_fs_1.default.pack(options.context, { ignore: (name) => dockerIgnoreFiles.has(slash_1.default(name)) });
+        const isDockerIgnored = yield createIsDockerIgnoredFunction(options.context);
+        const tarStream = tar_fs_1.default.pack(options.context, {
+            ignore: (aPath) => {
+                const relativePath = path_1.default.relative(options.context, aPath);
+                if (relativePath === options.dockerfileName) {
+                    return false;
+                }
+                else {
+                    return isDockerIgnored(relativePath);
+                }
+            },
+        });
         const { dockerode } = yield docker_client_1.dockerClient;
         return new Promise((resolve) => dockerode
             .buildImage(tarStream, {
@@ -48,3 +59,14 @@ const buildImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 exports.buildImage = buildImage;
+const createIsDockerIgnoredFunction = (context) => __awaiter(void 0, void 0, void 0, function* () {
+    const dockerIgnoreFilePath = path_1.default.join(context, ".dockerignore");
+    if (!fs_1.existsSync(dockerIgnoreFilePath)) {
+        return () => false;
+    }
+    const instance = dockerignore_1.default({ ignorecase: false });
+    const dockerIgnorePatterns = yield fs_1.promises.readFile(dockerIgnoreFilePath, { encoding: "utf-8" });
+    instance.add(dockerIgnorePatterns);
+    const filter = instance.createFilter();
+    return (aPath) => !filter(aPath);
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "8.5.1",
+  "version": "8.6.0",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [
@@ -32,6 +32,7 @@
     "updateDeps": "npx npm-check-updates -u"
   },
   "dependencies": {
+    "@balena/dockerignore": "^1.0.2",
     "@types/archiver": "^5.1.1",
     "@types/dockerode": "^3.2.7",
     "archiver": "^5.3.0",
@@ -40,9 +41,7 @@
     "docker-compose": "^0.23.17",
     "dockerode": "^3.3.1",
     "get-port": "^5.1.1",
-    "glob": "^7.2.0",
     "properties-reader": "^2.2.0",
-    "slash": "^3.0.0",
     "ssh-remote-port-forward": "^1.0.4",
     "tar-fs": "^2.1.1"
   },
@@ -50,7 +49,6 @@
     "@elastic/elasticsearch": "^7.14.1",
     "@types/byline": "^4.2.33",
     "@types/debug": "4.1.7",
-    "@types/glob": "^7.1.4",
     "@types/jest": "^27.0.3",
     "@types/node": "^16.9.6",
     "@types/node-fetch": "^2.5.12",

package/dist/docker-ignore.d.ts

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

package/dist/docker-ignore.js

@@ -1,41 +0,0 @@
-"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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findDockerIgnoreFiles = void 0;
-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, 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();
-    }
-    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);
-});
-exports.findDockerIgnoreFiles = findDockerIgnoreFiles;
-const findIgnoredFilesForPattern = (dockerIgnorePattern) => new Promise((resolve, reject) => glob_1.default(dockerIgnorePattern, (err, matches) => {
-    if (err) {
-        return reject(err);
-    }
-    else {
-        resolve(matches);
-    }
-}));