testcontainers 7.23.1 → 7.23.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -23,7 +23,7 @@ const create_labels_1 = require("../create-labels");
|
|
|
23
23
|
const buildImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
24
|
try {
|
|
25
25
|
logger_1.log.info(`Building image '${options.imageName.toString()}' with context '${options.context}'`);
|
|
26
|
-
const dockerIgnoreFiles = yield docker_ignore_1.findDockerIgnoreFiles(options.context);
|
|
26
|
+
const dockerIgnoreFiles = yield docker_ignore_1.findDockerIgnoreFiles(options.context, options.dockerfileName);
|
|
27
27
|
const tarStream = tar_fs_1.default.pack(options.context, { ignore: (name) => dockerIgnoreFiles.has(slash_1.default(name)) });
|
|
28
28
|
return new Promise((resolve) => dockerode_1.dockerode
|
|
29
29
|
.buildImage(tarStream, {
|
package/dist/docker-ignore.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const findDockerIgnoreFiles: (context: string) => Promise<Set<string>>;
|
|
1
|
+
export declare const findDockerIgnoreFiles: (context: string, dockerfileName: string) => Promise<Set<string>>;
|
package/dist/docker-ignore.js
CHANGED
|
@@ -17,7 +17,7 @@ const fs_1 = require("fs");
|
|
|
17
17
|
const os_1 = __importDefault(require("os"));
|
|
18
18
|
const glob_1 = __importDefault(require("glob"));
|
|
19
19
|
const path_1 = __importDefault(require("path"));
|
|
20
|
-
const findDockerIgnoreFiles = (context) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
|
+
const findDockerIgnoreFiles = (context, dockerfileName) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
const dockerIgnoreFilePath = path_1.default.join(context, ".dockerignore");
|
|
22
22
|
if (!fs_1.existsSync(dockerIgnoreFilePath)) {
|
|
23
23
|
return new Set();
|
|
@@ -25,6 +25,7 @@ const findDockerIgnoreFiles = (context) => __awaiter(void 0, void 0, void 0, fun
|
|
|
25
25
|
const dockerIgnorePatterns = (yield fs_1.promises.readFile(dockerIgnoreFilePath, { encoding: "utf-8" }))
|
|
26
26
|
.toString()
|
|
27
27
|
.split(os_1.default.EOL)
|
|
28
|
+
.filter((dockerIgnorePattern) => dockerIgnorePattern !== dockerfileName)
|
|
28
29
|
.map((dockerIgnorePattern) => path_1.default.resolve(context, dockerIgnorePattern));
|
|
29
30
|
const dockerIgnoreMatches = (yield Promise.all(dockerIgnorePatterns.map(findIgnoredFilesForPattern))).reduce((prev, next) => [...prev, ...next]);
|
|
30
31
|
return new Set(dockerIgnoreMatches);
|