testcontainers 10.18.0 → 10.20.0
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.
- package/build/common/file-lock.js +1 -1
- package/build/common/file-lock.js.map +1 -1
- package/build/common/index.d.ts +5 -5
- package/build/common/index.js +13 -13
- package/build/common/index.js.map +1 -1
- package/build/common/logger.js +3 -0
- package/build/common/logger.js.map +1 -1
- package/build/common/uuid.d.ts +1 -0
- package/build/common/uuid.js +4 -1
- package/build/common/uuid.js.map +1 -1
- package/build/container-runtime/auth/auths.d.ts +1 -1
- package/build/container-runtime/auth/auths.js.map +1 -1
- package/build/container-runtime/auth/credential-provider.d.ts +1 -1
- package/build/container-runtime/auth/credential-provider.js +1 -1
- package/build/container-runtime/auth/credential-provider.js.map +1 -1
- package/build/container-runtime/auth/get-auth-config.js +4 -4
- package/build/container-runtime/auth/get-auth-config.js.map +1 -1
- package/build/container-runtime/clients/client.js +7 -7
- package/build/container-runtime/clients/client.js.map +1 -1
- package/build/container-runtime/clients/compose/compose-client.d.ts +1 -1
- package/build/container-runtime/clients/compose/compose-client.js +10 -14
- package/build/container-runtime/clients/compose/compose-client.js.map +1 -1
- package/build/container-runtime/clients/compose/default-compose-options.js.map +1 -1
- package/build/container-runtime/clients/container/container-client.d.ts +2 -1
- package/build/container-runtime/clients/container/docker-container-client.d.ts +2 -1
- package/build/container-runtime/clients/container/docker-container-client.js +12 -2
- package/build/container-runtime/clients/container/docker-container-client.js.map +1 -1
- package/build/container-runtime/clients/container/types.d.ts +8 -0
- package/build/container-runtime/clients/container/types.js.map +1 -1
- package/build/container-runtime/clients/image/docker-image-client.d.ts +2 -1
- package/build/container-runtime/clients/image/docker-image-client.js +17 -5
- package/build/container-runtime/clients/image/docker-image-client.js.map +1 -1
- package/build/container-runtime/clients/image/image-client.d.ts +2 -1
- package/build/container-runtime/clients/network/docker-network-client.js.map +1 -1
- package/build/container-runtime/index.d.ts +4 -4
- package/build/container-runtime/index.js +5 -5
- package/build/container-runtime/index.js.map +1 -1
- package/build/container-runtime/strategies/configuration-strategy.d.ts +1 -1
- package/build/container-runtime/strategies/configuration-strategy.js +2 -2
- package/build/container-runtime/strategies/configuration-strategy.js.map +1 -1
- package/build/container-runtime/strategies/rootless-unix-socket-strategy.js +1 -1
- package/build/container-runtime/strategies/rootless-unix-socket-strategy.js.map +1 -1
- package/build/container-runtime/strategies/testcontainers-host-strategy.js +1 -1
- package/build/container-runtime/strategies/testcontainers-host-strategy.js.map +1 -1
- package/build/container-runtime/strategies/utils/config.js +2 -2
- package/build/container-runtime/strategies/utils/config.js.map +1 -1
- package/build/container-runtime/utils/attach-container.d.ts +1 -1
- package/build/container-runtime/utils/attach-container.js +1 -1
- package/build/container-runtime/utils/attach-container.js.map +1 -1
- package/build/container-runtime/utils/demux-stream.d.ts +1 -1
- package/build/container-runtime/utils/demux-stream.js.map +1 -1
- package/build/container-runtime/utils/image-exists.js.map +1 -1
- package/build/container-runtime/utils/lookup-host-ips.js +2 -2
- package/build/container-runtime/utils/lookup-host-ips.js.map +1 -1
- package/build/container-runtime/utils/pull-image.js +2 -2
- package/build/container-runtime/utils/pull-image.js.map +1 -1
- package/build/container-runtime/utils/resolve-host.js +2 -2
- package/build/container-runtime/utils/resolve-host.js.map +1 -1
- package/build/container-runtime/utils/run-in-container.js +2 -2
- package/build/container-runtime/utils/run-in-container.js.map +1 -1
- package/build/docker-compose-environment/docker-compose-environment.d.ts +3 -3
- package/build/docker-compose-environment/docker-compose-environment.js +5 -5
- package/build/docker-compose-environment/docker-compose-environment.js.map +1 -1
- package/build/docker-compose-environment/started-docker-compose-environment.d.ts +2 -2
- package/build/docker-compose-environment/started-docker-compose-environment.js +3 -3
- package/build/docker-compose-environment/started-docker-compose-environment.js.map +1 -1
- package/build/docker-compose-environment/stopped-docker-compose-environment.d.ts +1 -1
- package/build/docker-compose-environment/stopped-docker-compose-environment.js +1 -1
- package/build/docker-compose-environment/stopped-docker-compose-environment.js.map +1 -1
- package/build/generic-container/abstract-started-container.d.ts +3 -2
- package/build/generic-container/abstract-started-container.js +3 -0
- package/build/generic-container/abstract-started-container.js.map +1 -1
- package/build/generic-container/generic-container-builder.d.ts +2 -2
- package/build/generic-container/generic-container-builder.js +2 -2
- package/build/generic-container/generic-container-builder.js.map +1 -1
- package/build/generic-container/generic-container.d.ts +7 -6
- package/build/generic-container/generic-container.js +12 -10
- package/build/generic-container/generic-container.js.map +1 -1
- package/build/generic-container/started-generic-container.d.ts +8 -3
- package/build/generic-container/started-generic-container.js +33 -4
- package/build/generic-container/started-generic-container.js.map +1 -1
- package/build/generic-container/stopped-generic-container.d.ts +1 -1
- package/build/generic-container/stopped-generic-container.js.map +1 -1
- package/build/index.d.ts +16 -14
- package/build/index.js +30 -25
- package/build/index.js.map +1 -1
- package/build/port-forwarder/port-forwarder.js +1 -1
- package/build/port-forwarder/port-forwarder.js.map +1 -1
- package/build/reaper/reaper.js +3 -3
- package/build/reaper/reaper.js.map +1 -1
- package/build/test-container.d.ts +3 -2
- package/build/test-containers.js +2 -2
- package/build/test-containers.js.map +1 -1
- package/build/types.d.ts +10 -0
- package/build/utils/bound-ports.d.ts +1 -1
- package/build/utils/bound-ports.js +1 -1
- package/build/utils/bound-ports.js.map +1 -1
- package/build/utils/dockerfile-parser.d.ts +1 -1
- package/build/utils/dockerfile-parser.js +1 -1
- package/build/utils/dockerfile-parser.js.map +1 -1
- package/build/version.d.ts +1 -1
- package/build/version.js +1 -1
- package/build/wait-strategies/composite-wait-strategy.d.ts +1 -1
- package/build/wait-strategies/composite-wait-strategy.js +1 -1
- package/build/wait-strategies/composite-wait-strategy.js.map +1 -1
- package/build/wait-strategies/health-check-wait-strategy.js +1 -1
- package/build/wait-strategies/health-check-wait-strategy.js.map +1 -1
- package/build/wait-strategies/host-port-wait-strategy.d.ts +1 -1
- package/build/wait-strategies/host-port-wait-strategy.js +3 -3
- package/build/wait-strategies/host-port-wait-strategy.js.map +1 -1
- package/build/wait-strategies/http-wait-strategy.d.ts +1 -1
- package/build/wait-strategies/http-wait-strategy.js +1 -1
- package/build/wait-strategies/http-wait-strategy.js.map +1 -1
- package/build/wait-strategies/log-wait-strategy.d.ts +1 -1
- package/build/wait-strategies/log-wait-strategy.js +1 -1
- package/build/wait-strategies/log-wait-strategy.js.map +1 -1
- package/build/wait-strategies/shell-wait-strategy.js +1 -1
- package/build/wait-strategies/shell-wait-strategy.js.map +1 -1
- package/build/wait-strategies/startup-check-strategy.d.ts +1 -1
- package/build/wait-strategies/startup-check-strategy.js +2 -2
- package/build/wait-strategies/startup-check-strategy.js.map +1 -1
- package/build/wait-strategies/utils/port-check.js.map +1 -1
- package/build/wait-strategies/wait-for-container.d.ts +1 -1
- package/build/wait-strategies/wait-for-container.js.map +1 -1
- package/build/wait-strategies/wait.d.ts +2 -2
- package/build/wait-strategies/wait.js +4 -4
- package/build/wait-strategies/wait.js.map +1 -1
- package/package.json +1 -1
|
@@ -27,8 +27,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.withFileLock = void 0;
|
|
30
|
-
const path_1 = __importDefault(require("path"));
|
|
31
30
|
const promises_1 = require("fs/promises");
|
|
31
|
+
const path_1 = __importDefault(require("path"));
|
|
32
32
|
const proper_lockfile_1 = __importDefault(require("proper-lockfile"));
|
|
33
33
|
const logger_1 = require("./logger");
|
|
34
34
|
async function withFileLock(fileName, fn) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../../src/common/file-lock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../../src/common/file-lock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAwC;AACxC,gDAAwB;AACxB,sEAAuC;AACvC,qCAA+B;AAExB,KAAK,UAAU,YAAY,CAAI,QAAgB,EAAE,EAAW;IACjE,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAEhD,IAAI,aAAa,CAAC;IAClB,IAAI;QACF,YAAG,CAAC,KAAK,CAAC,wBAAwB,IAAI,MAAM,CAAC,CAAC;QAC9C,aAAa,GAAG,MAAM,yBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;YACxC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE;SAC1F,CAAC,CAAC;QACH,YAAG,CAAC,KAAK,CAAC,uBAAuB,IAAI,GAAG,CAAC,CAAC;QAC1C,OAAO,MAAM,EAAE,EAAE,CAAC;KACnB;YAAS;QACR,IAAI,aAAa,EAAE;YACjB,YAAG,CAAC,KAAK,CAAC,wBAAwB,IAAI,MAAM,CAAC,CAAC;YAC9C,MAAM,aAAa,EAAE,CAAC;YACtB,YAAG,CAAC,KAAK,CAAC,uBAAuB,IAAI,GAAG,CAAC,CAAC;SAC3C;KACF;AACH,CAAC;AAlBD,oCAkBC;AAED,KAAK,UAAU,kBAAkB,CAAC,QAAgB;IAChD,MAAM,GAAG,GAAG,wDAAa,KAAK,GAAC,CAAC;IAChC,MAAM,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChD,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC1B,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/build/common/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export {
|
|
2
|
-
export * from "./type-guards";
|
|
1
|
+
export { withFileLock } from "./file-lock";
|
|
3
2
|
export { hash } from "./hash";
|
|
4
|
-
export {
|
|
3
|
+
export { buildLog, composeLog, containerLog, execLog, log, Logger, pullLog } from "./logger";
|
|
4
|
+
export { IntervalRetry, Retry } from "./retry";
|
|
5
5
|
export { streamToString } from "./streams";
|
|
6
|
-
export
|
|
7
|
-
export {
|
|
6
|
+
export * from "./type-guards";
|
|
7
|
+
export { RandomUuid, Uuid } from "./uuid";
|
package/build/common/index.js
CHANGED
|
@@ -14,24 +14,24 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.
|
|
17
|
+
exports.RandomUuid = exports.streamToString = exports.IntervalRetry = exports.pullLog = exports.Logger = exports.log = exports.execLog = exports.containerLog = exports.composeLog = exports.buildLog = exports.hash = exports.withFileLock = void 0;
|
|
18
|
+
var file_lock_1 = require("./file-lock");
|
|
19
|
+
Object.defineProperty(exports, "withFileLock", { enumerable: true, get: function () { return file_lock_1.withFileLock; } });
|
|
20
|
+
var hash_1 = require("./hash");
|
|
21
|
+
Object.defineProperty(exports, "hash", { enumerable: true, get: function () { return hash_1.hash; } });
|
|
18
22
|
var logger_1 = require("./logger");
|
|
19
|
-
Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logger_1.Logger; } });
|
|
20
|
-
Object.defineProperty(exports, "log", { enumerable: true, get: function () { return logger_1.log; } });
|
|
21
23
|
Object.defineProperty(exports, "buildLog", { enumerable: true, get: function () { return logger_1.buildLog; } });
|
|
22
24
|
Object.defineProperty(exports, "composeLog", { enumerable: true, get: function () { return logger_1.composeLog; } });
|
|
23
|
-
Object.defineProperty(exports, "pullLog", { enumerable: true, get: function () { return logger_1.pullLog; } });
|
|
24
|
-
Object.defineProperty(exports, "execLog", { enumerable: true, get: function () { return logger_1.execLog; } });
|
|
25
25
|
Object.defineProperty(exports, "containerLog", { enumerable: true, get: function () { return logger_1.containerLog; } });
|
|
26
|
+
Object.defineProperty(exports, "execLog", { enumerable: true, get: function () { return logger_1.execLog; } });
|
|
27
|
+
Object.defineProperty(exports, "log", { enumerable: true, get: function () { return logger_1.log; } });
|
|
28
|
+
Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logger_1.Logger; } });
|
|
29
|
+
Object.defineProperty(exports, "pullLog", { enumerable: true, get: function () { return logger_1.pullLog; } });
|
|
30
|
+
var retry_1 = require("./retry");
|
|
31
|
+
Object.defineProperty(exports, "IntervalRetry", { enumerable: true, get: function () { return retry_1.IntervalRetry; } });
|
|
32
|
+
var streams_1 = require("./streams");
|
|
33
|
+
Object.defineProperty(exports, "streamToString", { enumerable: true, get: function () { return streams_1.streamToString; } });
|
|
26
34
|
__exportStar(require("./type-guards"), exports);
|
|
27
|
-
var hash_1 = require("./hash");
|
|
28
|
-
Object.defineProperty(exports, "hash", { enumerable: true, get: function () { return hash_1.hash; } });
|
|
29
35
|
var uuid_1 = require("./uuid");
|
|
30
36
|
Object.defineProperty(exports, "RandomUuid", { enumerable: true, get: function () { return uuid_1.RandomUuid; } });
|
|
31
|
-
var streams_1 = require("./streams");
|
|
32
|
-
Object.defineProperty(exports, "streamToString", { enumerable: true, get: function () { return streams_1.streamToString; } });
|
|
33
|
-
var file_lock_1 = require("./file-lock");
|
|
34
|
-
Object.defineProperty(exports, "withFileLock", { enumerable: true, get: function () { return file_lock_1.withFileLock; } });
|
|
35
|
-
var retry_1 = require("./retry");
|
|
36
|
-
Object.defineProperty(exports, "IntervalRetry", { enumerable: true, get: function () { return retry_1.IntervalRetry; } });
|
|
37
37
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAA2C;AAAlC,yGAAA,YAAY,OAAA;AACrB,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,mCAA6F;AAApF,kGAAA,QAAQ,OAAA;AAAE,oGAAA,UAAU,OAAA;AAAE,sGAAA,YAAY,OAAA;AAAE,iGAAA,OAAO,OAAA;AAAE,6FAAA,GAAG,OAAA;AAAE,gGAAA,MAAM,OAAA;AAAE,iGAAA,OAAO,OAAA;AAC1E,iCAA+C;AAAtC,sGAAA,aAAa,OAAA;AACtB,qCAA2C;AAAlC,yGAAA,cAAc,OAAA;AACvB,gDAA8B;AAC9B,+BAA0C;AAAjC,kGAAA,UAAU,OAAA"}
|
package/build/common/logger.js
CHANGED
|
@@ -11,6 +11,9 @@ class Logger {
|
|
|
11
11
|
constructor(namespace, showLevel = true) {
|
|
12
12
|
this.showLevel = showLevel;
|
|
13
13
|
this.logger = (0, debug_1.default)(namespace);
|
|
14
|
+
if (process.env.NODE_ENV === "test") {
|
|
15
|
+
this.logger.log = console.log.bind(console);
|
|
16
|
+
}
|
|
14
17
|
}
|
|
15
18
|
enabled() {
|
|
16
19
|
return this.logger.enabled;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyC;AAOzC,MAAa,MAAM;IAG+B;IAF/B,MAAM,CAAY;IAEnC,YAAY,SAAiB,EAAmB,YAAY,IAAI;QAAhB,cAAS,GAAT,SAAS,CAAO;QAC9D,IAAI,CAAC,MAAM,GAAG,IAAA,eAAK,EAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyC;AAOzC,MAAa,MAAM;IAG+B;IAF/B,MAAM,CAAY;IAEnC,YAAY,SAAiB,EAAmB,YAAY,IAAI;QAAhB,cAAS,GAAT,SAAS,CAAO;QAC9D,IAAI,CAAC,MAAM,GAAG,IAAA,eAAK,EAAC,SAAS,CAAC,CAAC;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC7C;IACH,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,OAAiB;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,OAAiB;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,OAAiB;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,OAAiB;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,OAAiB;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEO,aAAa,CAAC,OAAe,EAAE,KAAa,EAAE,OAAiB;QACrE,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE,CAAC;IAC1F,CAAC;IAEO,aAAa,CAAC,OAAiB;QACrC,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,IAAI,OAAO,EAAE,WAAW,EAAE;YACxB,GAAG,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC;SACrD;QACD,IAAI,OAAO,EAAE,SAAS,EAAE;YACtB,GAAG,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,CAAC;SAClC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAhDD,wBAgDC;AAEY,QAAA,GAAG,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACnC,QAAA,YAAY,GAAG,IAAI,MAAM,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;AAC9D,QAAA,UAAU,GAAG,IAAI,MAAM,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;AACzD,QAAA,QAAQ,GAAG,IAAI,MAAM,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;AACrD,QAAA,OAAO,GAAG,IAAI,MAAM,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;AACnD,QAAA,OAAO,GAAG,IAAI,MAAM,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC"}
|
package/build/common/uuid.d.ts
CHANGED
package/build/common/uuid.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.RandomUuid = void 0;
|
|
6
|
+
exports.randomUuid = exports.RandomUuid = void 0;
|
|
7
7
|
const crypto_1 = __importDefault(require("crypto"));
|
|
8
8
|
const hash_1 = require("./hash");
|
|
9
9
|
class RandomUuid {
|
|
@@ -12,4 +12,7 @@ class RandomUuid {
|
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
exports.RandomUuid = RandomUuid;
|
|
15
|
+
const randomUuidGen = new RandomUuid();
|
|
16
|
+
const randomUuid = () => randomUuidGen.nextUuid();
|
|
17
|
+
exports.randomUuid = randomUuid;
|
|
15
18
|
//# sourceMappingURL=uuid.js.map
|
package/build/common/uuid.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uuid.js","sourceRoot":"","sources":["../../src/common/uuid.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,iCAA8B;AAM9B,MAAa,UAAU;IACd,QAAQ;QACb,OAAO,IAAA,WAAI,EAAC,gBAAM,CAAC,UAAU,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,gCAIC"}
|
|
1
|
+
{"version":3,"file":"uuid.js","sourceRoot":"","sources":["../../src/common/uuid.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,iCAA8B;AAM9B,MAAa,UAAU;IACd,QAAQ;QACb,OAAO,IAAA,WAAI,EAAC,gBAAM,CAAC,UAAU,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,gCAIC;AAED,MAAM,aAAa,GAAG,IAAI,UAAU,EAAE,CAAC;AAChC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;AAA5C,QAAA,UAAU,cAAkC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { AuthConfig, ContainerRuntimeConfig } from "./types";
|
|
2
1
|
import { RegistryAuthLocator } from "./registry-auth-locator";
|
|
2
|
+
import { AuthConfig, ContainerRuntimeConfig } from "./types";
|
|
3
3
|
export declare class Auths implements RegistryAuthLocator {
|
|
4
4
|
getName(): string;
|
|
5
5
|
getAuthConfig(registry: string, dockerConfig: ContainerRuntimeConfig): Promise<AuthConfig | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auths.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/auths.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"auths.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/auths.ts"],"names":[],"mappings":";;;AACA,yDAAqD;AAGrD,MAAa,KAAK;IACT,OAAO;QACZ,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,QAAgB,EAAE,YAAoC;QAC/E,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,UAAU,GAAwB,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC;QAEtE,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;SAC/B;QAED,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;YAChE,MAAM,CAAC,QAAQ,EAAE,GAAG,aAAa,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5D,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEzC,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC/B,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAChC;aAAM;YACL,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;aACrC;YACD,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;aACrC;SACF;QAED,OAAO,UAAwB,CAAC;IAClC,CAAC;IAEO,aAAa,CAAC,QAAgB,EAAE,YAAoC;QAC1E,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC;QAE7C,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE;YAC7B,IAAI,IAAA,kCAAe,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE;gBAClC,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;aACzB;SACF;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA/CD,sBA+CC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ContainerRuntimeConfig, AuthConfig } from "./types";
|
|
2
1
|
import { RegistryAuthLocator } from "./registry-auth-locator";
|
|
2
|
+
import { AuthConfig, ContainerRuntimeConfig } from "./types";
|
|
3
3
|
export declare abstract class CredentialProvider implements RegistryAuthLocator {
|
|
4
4
|
abstract getName(): string;
|
|
5
5
|
abstract getCredentialProviderName(registry: string, dockerConfig: ContainerRuntimeConfig): string | undefined;
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CredentialProvider = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
|
-
const registry_matches_1 = require("./registry-matches");
|
|
6
5
|
const common_1 = require("../../common");
|
|
6
|
+
const registry_matches_1 = require("./registry-matches");
|
|
7
7
|
class CredentialProvider {
|
|
8
8
|
async getAuthConfig(registry, dockerConfig) {
|
|
9
9
|
const credentialProviderName = this.getCredentialProviderName(registry, dockerConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-provider.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/credential-provider.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"credential-provider.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/credential-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,14 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getAuthConfig = void 0;
|
|
7
|
-
const path_1 = __importDefault(require("path"));
|
|
8
|
-
const os_1 = __importDefault(require("os"));
|
|
9
7
|
const fs_1 = require("fs");
|
|
10
8
|
const promises_1 = require("fs/promises");
|
|
9
|
+
const os_1 = __importDefault(require("os"));
|
|
10
|
+
const path_1 = __importDefault(require("path"));
|
|
11
|
+
const common_1 = require("../../common");
|
|
12
|
+
const auths_1 = require("./auths");
|
|
11
13
|
const cred_helpers_1 = require("./cred-helpers");
|
|
12
14
|
const creds_store_1 = require("./creds-store");
|
|
13
|
-
const auths_1 = require("./auths");
|
|
14
|
-
const common_1 = require("../../common");
|
|
15
15
|
const dockerConfigLocation = process.env.DOCKER_CONFIG || `${os_1.default.homedir()}/.docker`;
|
|
16
16
|
const dockerConfigFile = path_1.default.resolve(dockerConfigLocation, "config.json");
|
|
17
17
|
const readDockerConfig = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-auth-config.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/get-auth-config.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"get-auth-config.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/get-auth-config.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAgC;AAChC,0CAAuC;AACvC,4CAAoB;AACpB,gDAAwB;AACxB,yCAAmC;AACnC,mCAAgC;AAChC,iDAA6C;AAC7C,+CAA2C;AAI3C,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,GAAG,YAAE,CAAC,OAAO,EAAE,UAAU,CAAC;AAEpF,MAAM,gBAAgB,GAAG,cAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAC;AAE3E,MAAM,gBAAgB,GAAG,KAAK,IAAqC,EAAE;IACnE,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;QAClC,OAAO,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;KAC1D;SAAM,IAAI,IAAA,eAAU,EAAC,gBAAgB,CAAC,EAAE;QACvC,OAAO,iBAAiB,CAAC,CAAC,MAAM,IAAA,mBAAQ,EAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;KACzE;SAAM;QACL,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAC5B;AACH,CAAC,CAAC;AAEF,SAAS,iBAAiB,CAAC,YAAoB;IAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAExC,OAAO;QACL,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,KAAK,EAAE,MAAM,CAAC,KAAK;KACpB,CAAC;AACJ,CAAC;AAED,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAC;AAExC,MAAM,oBAAoB,GAA0B,CAAC,IAAI,0BAAW,EAAE,EAAE,IAAI,wBAAU,EAAE,EAAE,IAAI,aAAK,EAAE,CAAC,CAAC;AAEvG,MAAM,UAAU,GAAG,IAAI,GAAG,EAAkC,CAAC;AAEtD,MAAM,aAAa,GAAG,KAAK,EAAE,QAAgB,EAAmC,EAAE;IACvF,IAAI,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAC5B,YAAG,CAAC,KAAK,CAAC,uCAAuC,QAAQ,GAAG,CAAC,CAAC;QAC9D,OAAO,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;KACjC;IAED,KAAK,MAAM,mBAAmB,IAAI,oBAAoB,EAAE;QACtD,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,YAAY,CAAC,CAAC;QAEzF,IAAI,UAAU,EAAE;YACd,YAAG,CAAC,KAAK,CAAC,mCAAmC,QAAQ,MAAM,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC5F,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YACrC,OAAO,UAAU,CAAC;SACnB;KACF;IAED,YAAG,CAAC,KAAK,CAAC,gDAAgD,QAAQ,GAAG,CAAC,CAAC;IACvE,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACpC,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAnBW,QAAA,aAAa,iBAmBxB"}
|
|
@@ -4,21 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getContainerRuntimeClient = exports.ContainerRuntimeClient = void 0;
|
|
7
|
-
const
|
|
7
|
+
const dockerode_1 = __importDefault(require("dockerode"));
|
|
8
|
+
const common_1 = require("../../common");
|
|
9
|
+
const version_1 = require("../../version");
|
|
8
10
|
const configuration_strategy_1 = require("../strategies/configuration-strategy");
|
|
11
|
+
const npipe_socket_strategy_1 = require("../strategies/npipe-socket-strategy");
|
|
12
|
+
const rootless_unix_socket_strategy_1 = require("../strategies/rootless-unix-socket-strategy");
|
|
9
13
|
const testcontainers_host_strategy_1 = require("../strategies/testcontainers-host-strategy");
|
|
10
14
|
const unix_socket_strategy_1 = require("../strategies/unix-socket-strategy");
|
|
11
|
-
const
|
|
12
|
-
const npipe_socket_strategy_1 = require("../strategies/npipe-socket-strategy");
|
|
13
|
-
const dockerode_1 = __importDefault(require("dockerode"));
|
|
15
|
+
const lookup_host_ips_1 = require("../utils/lookup-host-ips");
|
|
14
16
|
const remote_container_runtime_socket_path_1 = require("../utils/remote-container-runtime-socket-path");
|
|
15
17
|
const resolve_host_1 = require("../utils/resolve-host");
|
|
18
|
+
const compose_client_1 = require("./compose/compose-client");
|
|
16
19
|
const docker_container_client_1 = require("./container/docker-container-client");
|
|
17
20
|
const docker_image_client_1 = require("./image/docker-image-client");
|
|
18
21
|
const docker_network_client_1 = require("./network/docker-network-client");
|
|
19
|
-
const lookup_host_ips_1 = require("../utils/lookup-host-ips");
|
|
20
|
-
const common_1 = require("../../common");
|
|
21
|
-
const version_1 = require("../../version");
|
|
22
22
|
class ContainerRuntimeClient {
|
|
23
23
|
info;
|
|
24
24
|
compose;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/container-runtime/clients/client.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/container-runtime/clients/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { ComposeDownOptions, ComposeOptions } from "./types";
|
|
3
2
|
import { ComposeInfo } from "../types";
|
|
3
|
+
import { ComposeDownOptions, ComposeOptions } from "./types";
|
|
4
4
|
export interface ComposeClient {
|
|
5
5
|
info: ComposeInfo;
|
|
6
6
|
up(options: ComposeOptions, services?: Array<string>): Promise<void>;
|
|
@@ -22,15 +22,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
26
|
exports.getComposeClient = void 0;
|
|
30
|
-
const docker_compose_1 =
|
|
31
|
-
const docker_compose_2 = __importStar(require("docker-compose"));
|
|
32
|
-
const default_compose_options_1 = require("./default-compose-options");
|
|
27
|
+
const docker_compose_1 = __importStar(require("docker-compose"));
|
|
33
28
|
const common_1 = require("../../../common");
|
|
29
|
+
const default_compose_options_1 = require("./default-compose-options");
|
|
34
30
|
async function getComposeClient(environment) {
|
|
35
31
|
const info = await getComposeInfo();
|
|
36
32
|
switch (info?.compatability) {
|
|
@@ -46,14 +42,14 @@ exports.getComposeClient = getComposeClient;
|
|
|
46
42
|
async function getComposeInfo() {
|
|
47
43
|
try {
|
|
48
44
|
return {
|
|
49
|
-
version: (await
|
|
45
|
+
version: (await docker_compose_1.v2.version()).data.version,
|
|
50
46
|
compatability: "v2",
|
|
51
47
|
};
|
|
52
48
|
}
|
|
53
49
|
catch (err) {
|
|
54
50
|
try {
|
|
55
51
|
return {
|
|
56
|
-
version: (await
|
|
52
|
+
version: (await docker_compose_1.default.version()).data.version,
|
|
57
53
|
compatability: "v1",
|
|
58
54
|
};
|
|
59
55
|
}
|
|
@@ -144,11 +140,11 @@ class ComposeV2Client {
|
|
|
144
140
|
try {
|
|
145
141
|
if (services) {
|
|
146
142
|
common_1.log.info(`Upping Compose environment services ${services.join(", ")}...`);
|
|
147
|
-
await
|
|
143
|
+
await docker_compose_1.v2.upMany(services, await (0, default_compose_options_1.defaultComposeOptions)(this.environment, options));
|
|
148
144
|
}
|
|
149
145
|
else {
|
|
150
146
|
common_1.log.info(`Upping Compose environment...`);
|
|
151
|
-
await
|
|
147
|
+
await docker_compose_1.v2.upAll(await (0, default_compose_options_1.defaultComposeOptions)(this.environment, options));
|
|
152
148
|
}
|
|
153
149
|
common_1.log.info(`Upped Compose environment`);
|
|
154
150
|
}
|
|
@@ -168,11 +164,11 @@ class ComposeV2Client {
|
|
|
168
164
|
try {
|
|
169
165
|
if (services) {
|
|
170
166
|
common_1.log.info(`Pulling Compose environment images "${services.join('", "')}"...`);
|
|
171
|
-
await
|
|
167
|
+
await docker_compose_1.v2.pullMany(services, await (0, default_compose_options_1.defaultComposeOptions)(this.environment, { ...options, logger: common_1.pullLog }));
|
|
172
168
|
}
|
|
173
169
|
else {
|
|
174
170
|
common_1.log.info(`Pulling Compose environment images...`);
|
|
175
|
-
await
|
|
171
|
+
await docker_compose_1.v2.pullAll(await (0, default_compose_options_1.defaultComposeOptions)(this.environment, { ...options, logger: common_1.pullLog }));
|
|
176
172
|
}
|
|
177
173
|
common_1.log.info(`Pulled Compose environment`);
|
|
178
174
|
}
|
|
@@ -183,7 +179,7 @@ class ComposeV2Client {
|
|
|
183
179
|
async stop(options) {
|
|
184
180
|
try {
|
|
185
181
|
common_1.log.info(`Stopping Compose environment...`);
|
|
186
|
-
await
|
|
182
|
+
await docker_compose_1.v2.stop(await (0, default_compose_options_1.defaultComposeOptions)(this.environment, options));
|
|
187
183
|
common_1.log.info(`Stopped Compose environment`);
|
|
188
184
|
}
|
|
189
185
|
catch (err) {
|
|
@@ -193,7 +189,7 @@ class ComposeV2Client {
|
|
|
193
189
|
async down(options, downOptions) {
|
|
194
190
|
try {
|
|
195
191
|
common_1.log.info(`Downing Compose environment...`);
|
|
196
|
-
await
|
|
192
|
+
await docker_compose_1.v2.down({
|
|
197
193
|
...(await (0, default_compose_options_1.defaultComposeOptions)(this.environment, options)),
|
|
198
194
|
commandOptions: composeDownCommandOptions(downOptions),
|
|
199
195
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/compose/compose-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compose-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/compose/compose-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-compose-options.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/compose/default-compose-options.ts"],"names":[],"mappings":";;;AACA,2BAAyB;
|
|
1
|
+
{"version":3,"file":"default-compose-options.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/compose/default-compose-options.ts"],"names":[],"mappings":";;;AACA,2BAAyB;AACzB,4CAA+D;AAG/D,SAAgB,qBAAqB,CACnC,WAA8B,EAC9B,OAAuB;IAEvB,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,mBAAU,CAAC;IAEzC,OAAO;QACL,GAAG,EAAE,KAAK;QACV,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE;YACrB,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;gBACR,KAAK;qBACF,QAAQ,EAAE;qBACV,KAAK,CAAC,QAAG,CAAC;qBACV,MAAM,CAAC,yBAAgB,CAAC;qBACxB,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC/C,CAAC;YACH,CAAC,CAAC,SAAS;QACb,GAAG,EAAE,OAAO,CAAC,QAAQ;QACrB,MAAM,EAAE,OAAO,CAAC,KAAK;QACrB,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,oBAAoB,EAAE,OAAO,CAAC,WAAW;YACzC,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE;SAC9C;KACF,CAAC;AACJ,CAAC;AA3BD,sDA2BC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import Dockerode, { Container, ContainerCreateOptions, ContainerInfo, ContainerInspectInfo, ContainerLogsOptions, Network } from "dockerode";
|
|
4
4
|
import { Readable } from "stream";
|
|
5
|
-
import { ContainerStatus, ExecOptions, ExecResult } from "./types";
|
|
5
|
+
import { ContainerCommitOptions, ContainerStatus, ExecOptions, ExecResult } from "./types";
|
|
6
6
|
export interface ContainerClient {
|
|
7
7
|
dockerode: Dockerode;
|
|
8
8
|
getById(id: string): Container;
|
|
@@ -24,6 +24,7 @@ export interface ContainerClient {
|
|
|
24
24
|
restart(container: Container, opts?: {
|
|
25
25
|
timeout: number;
|
|
26
26
|
}): Promise<void>;
|
|
27
|
+
commit(container: Container, opts: ContainerCommitOptions): Promise<string>;
|
|
27
28
|
events(container: Container, eventNames: string[]): Promise<Readable>;
|
|
28
29
|
remove(container: Container, opts?: {
|
|
29
30
|
removeVolumes: boolean;
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import Dockerode, { Container, ContainerCreateOptions, ContainerInfo, ContainerInspectInfo, ContainerLogsOptions, Network } from "dockerode";
|
|
4
4
|
import { Readable } from "stream";
|
|
5
|
-
import { ContainerStatus, ExecOptions, ExecResult } from "./types";
|
|
6
5
|
import { ContainerClient } from "./container-client";
|
|
6
|
+
import { ContainerCommitOptions, ContainerStatus, ExecOptions, ExecResult } from "./types";
|
|
7
7
|
export declare class DockerContainerClient implements ContainerClient {
|
|
8
8
|
readonly dockerode: Dockerode;
|
|
9
9
|
constructor(dockerode: Dockerode);
|
|
@@ -26,6 +26,7 @@ export declare class DockerContainerClient implements ContainerClient {
|
|
|
26
26
|
restart(container: Container, opts?: {
|
|
27
27
|
timeout: number;
|
|
28
28
|
}): Promise<void>;
|
|
29
|
+
commit(container: Container, opts: ContainerCommitOptions): Promise<string>;
|
|
29
30
|
remove(container: Container, opts?: {
|
|
30
31
|
removeVolumes: boolean;
|
|
31
32
|
}): Promise<void>;
|
|
@@ -107,9 +107,7 @@ class DockerContainerClient {
|
|
|
107
107
|
}
|
|
108
108
|
async inspect(container) {
|
|
109
109
|
try {
|
|
110
|
-
common_1.log.debug(`Inspecting container...`, { containerId: container.id });
|
|
111
110
|
const inspectInfo = await container.inspect();
|
|
112
|
-
common_1.log.debug(`Inspected container`, { containerId: container.id });
|
|
113
111
|
return inspectInfo;
|
|
114
112
|
}
|
|
115
113
|
catch (err) {
|
|
@@ -242,6 +240,18 @@ class DockerContainerClient {
|
|
|
242
240
|
throw err;
|
|
243
241
|
}
|
|
244
242
|
}
|
|
243
|
+
async commit(container, opts) {
|
|
244
|
+
try {
|
|
245
|
+
common_1.log.debug(`Committing container...`, { containerId: container.id });
|
|
246
|
+
const { Id: imageId } = await container.commit(opts);
|
|
247
|
+
common_1.log.debug(`Committed container to image "${imageId}"`, { containerId: container.id });
|
|
248
|
+
return imageId;
|
|
249
|
+
}
|
|
250
|
+
catch (err) {
|
|
251
|
+
common_1.log.error(`Failed to commit container: ${err}`, { containerId: container.id });
|
|
252
|
+
throw err;
|
|
253
|
+
}
|
|
254
|
+
}
|
|
245
255
|
async remove(container, opts) {
|
|
246
256
|
try {
|
|
247
257
|
common_1.log.debug(`Removing container...`, { containerId: container.id });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-container-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/container/docker-container-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"docker-container-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/container/docker-container-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,5 +13,13 @@ export type ExecResult = {
|
|
|
13
13
|
stderr: string;
|
|
14
14
|
exitCode: number;
|
|
15
15
|
};
|
|
16
|
+
export type ContainerCommitOptions = {
|
|
17
|
+
repo: string;
|
|
18
|
+
tag: string;
|
|
19
|
+
comment?: string;
|
|
20
|
+
author?: string;
|
|
21
|
+
pause?: boolean;
|
|
22
|
+
changes?: string;
|
|
23
|
+
};
|
|
16
24
|
export declare const CONTAINER_STATUSES: readonly ["created", "restarting", "running", "removing", "paused", "exited", "dead"];
|
|
17
25
|
export type ContainerStatus = (typeof CONTAINER_STATUSES)[number];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/container/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/container/types.ts"],"names":[],"mappings":";;;AAea,QAAA,kBAAkB,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAU,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import Dockerode, { ImageBuildOptions } from "dockerode";
|
|
1
|
+
import Dockerode, { ImageBuildOptions, ImageInspectInfo } from "dockerode";
|
|
2
2
|
import { ImageName } from "../../image-name";
|
|
3
3
|
import { ImageClient } from "./image-client";
|
|
4
4
|
export declare class DockerImageClient implements ImageClient {
|
|
@@ -9,6 +9,7 @@ export declare class DockerImageClient implements ImageClient {
|
|
|
9
9
|
constructor(dockerode: Dockerode, indexServerAddress: string);
|
|
10
10
|
build(context: string, opts: ImageBuildOptions): Promise<void>;
|
|
11
11
|
private createIsDockerIgnoredFunction;
|
|
12
|
+
inspect(imageName: ImageName): Promise<ImageInspectInfo>;
|
|
12
13
|
exists(imageName: ImageName): Promise<boolean>;
|
|
13
14
|
pull(imageName: ImageName, opts?: {
|
|
14
15
|
force: boolean;
|
|
@@ -4,14 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DockerImageClient = void 0;
|
|
7
|
-
const byline_1 = __importDefault(require("byline"));
|
|
8
|
-
const tar_fs_1 = __importDefault(require("tar-fs"));
|
|
9
|
-
const path_1 = __importDefault(require("path"));
|
|
10
|
-
const fs_1 = require("fs");
|
|
11
7
|
const dockerignore_1 = __importDefault(require("@balena/dockerignore"));
|
|
12
|
-
const get_auth_config_1 = require("../../auth/get-auth-config");
|
|
13
8
|
const async_lock_1 = __importDefault(require("async-lock"));
|
|
9
|
+
const byline_1 = __importDefault(require("byline"));
|
|
10
|
+
const fs_1 = require("fs");
|
|
11
|
+
const path_1 = __importDefault(require("path"));
|
|
12
|
+
const tar_fs_1 = __importDefault(require("tar-fs"));
|
|
14
13
|
const common_1 = require("../../../common");
|
|
14
|
+
const get_auth_config_1 = require("../../auth/get-auth-config");
|
|
15
15
|
class DockerImageClient {
|
|
16
16
|
dockerode;
|
|
17
17
|
indexServerAddress;
|
|
@@ -68,6 +68,18 @@ class DockerImageClient {
|
|
|
68
68
|
const filter = instance.createFilter();
|
|
69
69
|
return (aPath) => !filter(aPath);
|
|
70
70
|
}
|
|
71
|
+
async inspect(imageName) {
|
|
72
|
+
try {
|
|
73
|
+
common_1.log.debug(`Inspecting image: "${imageName.string}"...`);
|
|
74
|
+
const imageInfo = await this.dockerode.getImage(imageName.string).inspect();
|
|
75
|
+
common_1.log.debug(`Inspected image: "${imageName.string}"`);
|
|
76
|
+
return imageInfo;
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
common_1.log.debug(`Failed to inspect image "${imageName.string}"`);
|
|
80
|
+
throw err;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
71
83
|
async exists(imageName) {
|
|
72
84
|
return this.imageExistsLock.acquire(imageName.string, async () => {
|
|
73
85
|
if (this.existingImages.has(imageName.string)) {
|