testcontainers 10.28.0 → 11.0.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/LICENSE +2 -2
- package/README.md +3 -4
- package/build/common/file-lock.js +18 -9
- package/build/common/file-lock.js.map +1 -1
- package/build/common/hash.js +1 -2
- package/build/common/hash.js.map +1 -1
- package/build/common/index.d.ts +2 -1
- package/build/common/index.js +3 -2
- package/build/common/index.js.map +1 -1
- package/build/common/logger.js.map +1 -1
- package/build/common/retry.d.ts +4 -4
- package/build/common/retry.js +4 -4
- package/build/common/retry.js.map +1 -1
- package/build/common/streams.js.map +1 -1
- package/build/common/time.d.ts +2 -0
- package/build/common/time.js +8 -0
- package/build/common/time.js.map +1 -0
- package/build/container-runtime/auth/auths.js.map +1 -1
- package/build/container-runtime/auth/cred-helpers.js.map +1 -1
- package/build/container-runtime/auth/credential-provider.js.map +1 -1
- package/build/container-runtime/auth/creds-store.js.map +1 -1
- package/build/container-runtime/auth/get-auth-config.js.map +1 -1
- package/build/container-runtime/clients/client.js +3 -4
- package/build/container-runtime/clients/client.js.map +1 -1
- package/build/container-runtime/clients/compose/compose-client.d.ts +0 -3
- package/build/container-runtime/clients/compose/compose-client.js +16 -132
- package/build/container-runtime/clients/compose/compose-client.js.map +1 -1
- package/build/container-runtime/clients/compose/default-compose-options.d.ts +0 -1
- package/build/container-runtime/clients/compose/default-compose-options.js +1 -2
- package/build/container-runtime/clients/compose/default-compose-options.js.map +1 -1
- package/build/container-runtime/clients/compose/parse-compose-container-name.js +1 -2
- package/build/container-runtime/clients/compose/parse-compose-container-name.js.map +1 -1
- package/build/container-runtime/clients/compose/types.d.ts +0 -1
- package/build/container-runtime/clients/container/container-client.d.ts +0 -2
- package/build/container-runtime/clients/container/docker-container-client.d.ts +0 -2
- package/build/container-runtime/clients/container/docker-container-client.js +3 -4
- package/build/container-runtime/clients/container/docker-container-client.js.map +1 -1
- package/build/container-runtime/clients/image/docker-image-client.js.map +1 -1
- package/build/container-runtime/clients/network/docker-network-client.js.map +1 -1
- package/build/container-runtime/clients/types.d.ts +0 -5
- package/build/container-runtime/image-name.js.map +1 -1
- package/build/container-runtime/strategies/configuration-strategy.d.ts +0 -3
- package/build/container-runtime/strategies/configuration-strategy.js +9 -15
- package/build/container-runtime/strategies/configuration-strategy.js.map +1 -1
- package/build/container-runtime/strategies/npipe-socket-strategy.d.ts +0 -1
- package/build/container-runtime/strategies/npipe-socket-strategy.js.map +1 -1
- package/build/container-runtime/strategies/rootless-unix-socket-strategy.d.ts +0 -1
- package/build/container-runtime/strategies/rootless-unix-socket-strategy.js.map +1 -1
- package/build/container-runtime/strategies/testcontainers-host-strategy.js.map +1 -1
- package/build/container-runtime/strategies/types.d.ts +0 -1
- package/build/container-runtime/strategies/unix-socket-strategy.d.ts +0 -1
- package/build/container-runtime/strategies/unix-socket-strategy.js.map +1 -1
- package/build/container-runtime/strategies/utils/config.d.ts +0 -1
- package/build/container-runtime/strategies/utils/config.js.map +1 -1
- package/build/container-runtime/utils/attach-container.js.map +1 -1
- package/build/container-runtime/utils/demux-stream.d.ts +0 -1
- package/build/container-runtime/utils/demux-stream.js +1 -2
- package/build/container-runtime/utils/demux-stream.js.map +1 -1
- package/build/container-runtime/utils/image-exists.js +1 -2
- package/build/container-runtime/utils/image-exists.js.map +1 -1
- package/build/container-runtime/utils/lookup-host-ips.js.map +1 -1
- package/build/container-runtime/utils/pull-image.js.map +1 -1
- package/build/container-runtime/utils/remote-container-runtime-socket-path.d.ts +0 -5
- package/build/container-runtime/utils/remote-container-runtime-socket-path.js.map +1 -1
- package/build/container-runtime/utils/resolve-host.d.ts +0 -5
- package/build/container-runtime/utils/resolve-host.js.map +1 -1
- package/build/container-runtime/utils/run-in-container.js.map +1 -1
- package/build/container-runtime/utils/start-container.js.map +1 -1
- package/build/docker-compose-environment/docker-compose-environment.d.ts +2 -2
- 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.js.map +1 -1
- package/build/generic-container/abstract-started-container.d.ts +0 -2
- package/build/generic-container/abstract-started-container.js.map +1 -1
- package/build/generic-container/abstract-stopped-container.d.ts +0 -1
- package/build/generic-container/generic-container-builder.js +1 -1
- package/build/generic-container/generic-container-builder.js.map +1 -1
- package/build/generic-container/generic-container.d.ts +1 -2
- package/build/generic-container/generic-container.js +9 -10
- package/build/generic-container/generic-container.js.map +1 -1
- package/build/generic-container/started-generic-container.d.ts +0 -2
- package/build/generic-container/started-generic-container.js.map +1 -1
- package/build/generic-container/stopped-generic-container.d.ts +0 -1
- package/build/index.d.ts +4 -4
- package/build/index.js +4 -4
- 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 +2 -2
- package/build/reaper/reaper.js.map +1 -1
- package/build/test-container.d.ts +0 -2
- package/build/test-containers.js.map +1 -1
- package/build/types.d.ts +0 -2
- package/build/utils/bound-ports.js.map +1 -1
- package/build/utils/dockerfile-parser.js +1 -2
- package/build/utils/dockerfile-parser.js.map +1 -1
- package/build/utils/labels.js +2 -2
- package/build/utils/labels.js.map +1 -1
- package/build/utils/map-inspect-result.js +1 -2
- package/build/utils/map-inspect-result.js.map +1 -1
- package/build/utils/port-generator.d.ts +1 -4
- package/build/utils/port-generator.js +19 -24
- package/build/utils/port-generator.js.map +1 -1
- package/build/version.d.ts +1 -1
- package/build/version.js +1 -1
- package/build/version.js.map +1 -1
- package/build/wait-strategies/composite-wait-strategy.d.ts +1 -1
- package/build/wait-strategies/composite-wait-strategy.js +2 -2
- package/build/wait-strategies/composite-wait-strategy.js.map +1 -1
- package/build/wait-strategies/health-check-wait-strategy.js +2 -2
- package/build/wait-strategies/health-check-wait-strategy.js.map +1 -1
- package/build/wait-strategies/host-port-wait-strategy.js +2 -2
- package/build/wait-strategies/host-port-wait-strategy.js.map +1 -1
- package/build/wait-strategies/http-wait-strategy.d.ts +19 -11
- package/build/wait-strategies/http-wait-strategy.js +33 -9
- package/build/wait-strategies/http-wait-strategy.js.map +1 -1
- package/build/wait-strategies/log-wait-strategy.js +2 -2
- package/build/wait-strategies/log-wait-strategy.js.map +1 -1
- package/build/wait-strategies/one-shot-startup-startegy.js.map +1 -1
- package/build/wait-strategies/shell-wait-strategy.js +2 -2
- package/build/wait-strategies/shell-wait-strategy.js.map +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.js.map +1 -1
- package/build/wait-strategies/wait-strategy.d.ts +3 -3
- package/build/wait-strategies/wait-strategy.js +4 -4
- package/build/wait-strategies/wait-strategy.js.map +1 -1
- package/package.json +8 -8
package/LICENSE
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
MIT License
|
|
2
2
|
|
|
3
|
-
Copyright (c) 2018 -
|
|
3
|
+
Copyright (c) 2018 - 2025 Cristian Greco
|
|
4
4
|
|
|
5
5
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
6
|
of this software and associated documentation files (the "Software"), to deal
|
|
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
18
18
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
19
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
20
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
[](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=116414510&machine=standardLinux32gb&devcontainer_path=.devcontainer%2Fdevcontainer.json&location=EastUs)
|
|
4
4
|
|
|
5
|
-
[](https://github.com/testcontainers/testcontainers-node/actions/workflows/checks.yml)
|
|
6
6
|
[](https://www.npmjs.com/package/testcontainers)
|
|
7
7
|
[](https://www.npmjs.com/package/testcontainers)
|
|
8
8
|
|
|
@@ -16,7 +16,7 @@ See [LICENSE](https://github.com/testcontainers/testcontainers-node/blob/main/LI
|
|
|
16
16
|
|
|
17
17
|
## Copyright
|
|
18
18
|
|
|
19
|
-
Copyright (c) 2018 -
|
|
19
|
+
Copyright (c) 2018 - 2025 Cristian Greco and other authors.
|
|
20
20
|
|
|
21
21
|
## Contributing
|
|
22
22
|
|
|
@@ -24,7 +24,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for how to contribute to this repo.
|
|
|
24
24
|
|
|
25
25
|
See [contributors](https://github.com/testcontainers/testcontainers-node/graphs/contributors/) for all contributors.
|
|
26
26
|
|
|
27
|
-
|
|
28
|
-
----
|
|
27
|
+
---
|
|
29
28
|
|
|
30
29
|
Join our [Slack workspace](https://slack.testcontainers.org/) | [Testcontainers OSS](https://java.testcontainers.org/) | [Testcontainers Cloud](https://www.testcontainers.cloud/)
|
|
@@ -15,18 +15,28 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
37
|
};
|
|
28
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.withFileLock =
|
|
39
|
+
exports.withFileLock = withFileLock;
|
|
30
40
|
const promises_1 = require("fs/promises");
|
|
31
41
|
const path_1 = __importDefault(require("path"));
|
|
32
42
|
const proper_lockfile_1 = __importDefault(require("proper-lockfile"));
|
|
@@ -50,7 +60,6 @@ async function withFileLock(fileName, fn) {
|
|
|
50
60
|
}
|
|
51
61
|
}
|
|
52
62
|
}
|
|
53
|
-
exports.withFileLock = withFileLock;
|
|
54
63
|
async function createEmptyTmpFile(fileName) {
|
|
55
64
|
const tmp = await Promise.resolve().then(() => __importStar(require("tmp")));
|
|
56
65
|
const file = path_1.default.resolve(tmp.tmpdir, fileName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../../src/common/file-lock.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../../src/common/file-lock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,oCAkBC;AAvBD,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,CAAC;QACH,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;IACpB,CAAC;YAAS,CAAC;QACT,IAAI,aAAa,EAAE,CAAC;YAClB,YAAG,CAAC,KAAK,CAAC,wBAAwB,IAAI,MAAM,CAAC,CAAC;YAC9C,MAAM,aAAa,EAAE,CAAC;YACtB,YAAG,CAAC,KAAK,CAAC,uBAAuB,IAAI,GAAG,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;AACH,CAAC;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/hash.js
CHANGED
|
@@ -3,10 +3,9 @@ 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.hash =
|
|
6
|
+
exports.hash = hash;
|
|
7
7
|
const crypto_1 = __importDefault(require("crypto"));
|
|
8
8
|
function hash(str) {
|
|
9
9
|
return crypto_1.default.createHash("sha256").update(str).digest("hex");
|
|
10
10
|
}
|
|
11
|
-
exports.hash = hash;
|
|
12
11
|
//# sourceMappingURL=hash.js.map
|
package/build/common/hash.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../src/common/hash.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../src/common/hash.ts"],"names":[],"mappings":";;;;;AAEA,oBAEC;AAJD,oDAA4B;AAE5B,SAAgB,IAAI,CAAC,GAAW;IAC9B,OAAO,gBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC"}
|
package/build/common/index.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export { withFileLock } from "./file-lock";
|
|
2
2
|
export { hash } from "./hash";
|
|
3
|
-
export { buildLog, composeLog, containerLog, execLog, log,
|
|
3
|
+
export { Logger, buildLog, composeLog, containerLog, execLog, log, pullLog } from "./logger";
|
|
4
4
|
export { IntervalRetry, Retry } from "./retry";
|
|
5
5
|
export { streamToString } from "./streams";
|
|
6
|
+
export * from "./time";
|
|
6
7
|
export * from "./type-guards";
|
|
7
8
|
export { RandomUuid, Uuid } from "./uuid";
|
package/build/common/index.js
CHANGED
|
@@ -14,23 +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.RandomUuid = exports.streamToString = exports.IntervalRetry = exports.pullLog = exports.
|
|
17
|
+
exports.RandomUuid = exports.streamToString = exports.IntervalRetry = exports.pullLog = exports.log = exports.execLog = exports.containerLog = exports.composeLog = exports.buildLog = exports.Logger = exports.hash = exports.withFileLock = void 0;
|
|
18
18
|
var file_lock_1 = require("./file-lock");
|
|
19
19
|
Object.defineProperty(exports, "withFileLock", { enumerable: true, get: function () { return file_lock_1.withFileLock; } });
|
|
20
20
|
var hash_1 = require("./hash");
|
|
21
21
|
Object.defineProperty(exports, "hash", { enumerable: true, get: function () { return hash_1.hash; } });
|
|
22
22
|
var logger_1 = require("./logger");
|
|
23
|
+
Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logger_1.Logger; } });
|
|
23
24
|
Object.defineProperty(exports, "buildLog", { enumerable: true, get: function () { return logger_1.buildLog; } });
|
|
24
25
|
Object.defineProperty(exports, "composeLog", { enumerable: true, get: function () { return logger_1.composeLog; } });
|
|
25
26
|
Object.defineProperty(exports, "containerLog", { enumerable: true, get: function () { return logger_1.containerLog; } });
|
|
26
27
|
Object.defineProperty(exports, "execLog", { enumerable: true, get: function () { return logger_1.execLog; } });
|
|
27
28
|
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
29
|
Object.defineProperty(exports, "pullLog", { enumerable: true, get: function () { return logger_1.pullLog; } });
|
|
30
30
|
var retry_1 = require("./retry");
|
|
31
31
|
Object.defineProperty(exports, "IntervalRetry", { enumerable: true, get: function () { return retry_1.IntervalRetry; } });
|
|
32
32
|
var streams_1 = require("./streams");
|
|
33
33
|
Object.defineProperty(exports, "streamToString", { enumerable: true, get: function () { return streams_1.streamToString; } });
|
|
34
|
+
__exportStar(require("./time"), exports);
|
|
34
35
|
__exportStar(require("./type-guards"), exports);
|
|
35
36
|
var uuid_1 = require("./uuid");
|
|
36
37
|
Object.defineProperty(exports, "RandomUuid", { enumerable: true, get: function () { return uuid_1.RandomUuid; } });
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,gGAAA,MAAM,OAAA;AAAE,kGAAA,QAAQ,OAAA;AAAE,oGAAA,UAAU,OAAA;AAAE,sGAAA,YAAY,OAAA;AAAE,iGAAA,OAAO,OAAA;AAAE,6FAAA,GAAG,OAAA;AAAE,iGAAA,OAAO,OAAA;AAC1E,iCAA+C;AAAtC,sGAAA,aAAa,OAAA;AACtB,qCAA2C;AAAlC,yGAAA,cAAc,OAAA;AACvB,yCAAuB;AACvB,gDAA8B;AAC9B,+BAA0C;AAAjC,kGAAA,UAAU,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyC;AAOzC,MAAa,MAAM;IAKE;IAJF,MAAM,CAAY;IAEnC,YACE,SAAiB,EACA,YAAY,IAAI;QAAhB,cAAS,GAAT,SAAS,CAAO;QAEjC,IAAI,CAAC,MAAM,GAAG,IAAA,eAAK,EAAC,SAAS,CAAC,CAAC;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyC;AAOzC,MAAa,MAAM;IAKE;IAJF,MAAM,CAAY;IAEnC,YACE,SAAiB,EACA,YAAY,IAAI;QAAhB,cAAS,GAAT,SAAS,CAAO;QAEjC,IAAI,CAAC,MAAM,GAAG,IAAA,eAAK,EAAC,SAAS,CAAC,CAAC;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC;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,CAAC;YACzB,GAAG,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC;QACtD,CAAC;QACD,IAAI,OAAO,EAAE,SAAS,EAAE,CAAC;YACvB,GAAG,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,CAAC;QACnC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAnDD,wBAmDC;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/retry.d.ts
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { Clock, Time } from "./clock";
|
|
2
2
|
export interface Retry<T, U> {
|
|
3
|
-
retryUntil(fn: () => Promise<T>, predicate: (result: T) => boolean | Promise<boolean>, onTimeout: () => U,
|
|
3
|
+
retryUntil(fn: () => Promise<T>, predicate: (result: T) => boolean | Promise<boolean>, onTimeout: () => U, timeoutMs: number): Promise<T | U>;
|
|
4
4
|
}
|
|
5
5
|
declare abstract class AbstractRetry<T, U> implements Retry<T, U> {
|
|
6
6
|
protected readonly clock: Clock;
|
|
7
7
|
protected constructor(clock?: Clock);
|
|
8
|
-
abstract retryUntil(fn: () => Promise<T>, predicate: (result: T) => boolean | Promise<boolean>, onTimeout: () => U,
|
|
9
|
-
protected hasTimedOut(
|
|
8
|
+
abstract retryUntil(fn: () => Promise<T>, predicate: (result: T) => boolean | Promise<boolean>, onTimeout: () => U, timeoutMs: number): Promise<T | U>;
|
|
9
|
+
protected hasTimedOut(timeoutMs: number, startTime: Time): boolean;
|
|
10
10
|
protected wait(duration: number): Promise<void>;
|
|
11
11
|
}
|
|
12
12
|
export declare class IntervalRetry<T, U> extends AbstractRetry<T, U> {
|
|
13
13
|
private readonly interval;
|
|
14
14
|
constructor(interval: number);
|
|
15
|
-
retryUntil(fn: (attempt: number) => Promise<T>, predicate: (result: T) => boolean | Promise<boolean>, onTimeout: () => U,
|
|
15
|
+
retryUntil(fn: (attempt: number) => Promise<T>, predicate: (result: T) => boolean | Promise<boolean>, onTimeout: () => U, timeoutMs: number): Promise<T | U>;
|
|
16
16
|
}
|
|
17
17
|
export {};
|
package/build/common/retry.js
CHANGED
|
@@ -7,8 +7,8 @@ class AbstractRetry {
|
|
|
7
7
|
constructor(clock = new clock_1.SystemClock()) {
|
|
8
8
|
this.clock = clock;
|
|
9
9
|
}
|
|
10
|
-
hasTimedOut(
|
|
11
|
-
return this.clock.getTime() - startTime >
|
|
10
|
+
hasTimedOut(timeoutMs, startTime) {
|
|
11
|
+
return this.clock.getTime() - startTime > timeoutMs;
|
|
12
12
|
}
|
|
13
13
|
wait(duration) {
|
|
14
14
|
return new Promise((resolve) => setTimeout(resolve, duration));
|
|
@@ -20,12 +20,12 @@ class IntervalRetry extends AbstractRetry {
|
|
|
20
20
|
super();
|
|
21
21
|
this.interval = interval;
|
|
22
22
|
}
|
|
23
|
-
async retryUntil(fn, predicate, onTimeout,
|
|
23
|
+
async retryUntil(fn, predicate, onTimeout, timeoutMs) {
|
|
24
24
|
const startTime = this.clock.getTime();
|
|
25
25
|
let attemptNumber = 0;
|
|
26
26
|
let result = await fn(attemptNumber++);
|
|
27
27
|
while (!(await predicate(result))) {
|
|
28
|
-
if (this.hasTimedOut(
|
|
28
|
+
if (this.hasTimedOut(timeoutMs, startTime)) {
|
|
29
29
|
return onTimeout();
|
|
30
30
|
}
|
|
31
31
|
await this.wait(this.interval);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/common/retry.ts"],"names":[],"mappings":";;;AAAA,mCAAmD;AAWnD,MAAe,aAAa;IACe;IAAzC,YAAyC,QAAe,IAAI,mBAAW,EAAE;QAAhC,UAAK,GAAL,KAAK,CAA2B;IAAG,CAAC;IASnE,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/common/retry.ts"],"names":[],"mappings":";;;AAAA,mCAAmD;AAWnD,MAAe,aAAa;IACe;IAAzC,YAAyC,QAAe,IAAI,mBAAW,EAAE;QAAhC,UAAK,GAAL,KAAK,CAA2B;IAAG,CAAC;IASnE,WAAW,CAAC,SAAiB,EAAE,SAAe;QACtD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,SAAS,GAAG,SAAS,CAAC;IACtD,CAAC;IAES,IAAI,CAAC,QAAgB;QAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjE,CAAC;CACF;AAED,MAAa,aAAoB,SAAQ,aAAmB;IAC7B;IAA7B,YAA6B,QAAgB;QAC3C,KAAK,EAAE,CAAC;QADmB,aAAQ,GAAR,QAAQ,CAAQ;IAE7C,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,EAAmC,EACnC,SAAoD,EACpD,SAAkB,EAClB,SAAiB;QAEjB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC;QAEvC,OAAO,CAAC,CAAC,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YAClC,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;gBAC3C,OAAO,SAAS,EAAE,CAAC;YACrB,CAAC;YACD,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/B,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA1BD,sCA0BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../src/common/streams.ts"],"names":[],"mappings":";;;AAIO,MAAM,cAAc,GAAG,KAAK,EAAE,MAAgB,EAAE,UAAmB,EAAE,IAAI,EAAE,KAAK,EAAE,EAAmB,EAAE;IAC5G,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../src/common/streams.ts"],"names":[],"mappings":";;;AAIO,MAAM,cAAc,GAAG,KAAK,EAAE,MAAgB,EAAE,UAAmB,EAAE,IAAI,EAAE,KAAK,EAAE,EAAmB,EAAE;IAC5G,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEpD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACzC,CAAC,CAAC;AAVW,QAAA,cAAc,kBAUzB"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.toNanos = exports.toSeconds = void 0;
|
|
4
|
+
const toSeconds = (ms) => Math.trunc(ms * 1e-3);
|
|
5
|
+
exports.toSeconds = toSeconds;
|
|
6
|
+
const toNanos = (ms) => ms * 1e6;
|
|
7
|
+
exports.toNanos = toNanos;
|
|
8
|
+
//# sourceMappingURL=time.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/common/time.ts"],"names":[],"mappings":";;;AAAO,MAAM,SAAS,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;AAAlD,QAAA,SAAS,aAAyC;AAExD,MAAM,OAAO,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;AAAnC,QAAA,OAAO,WAA4B"}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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,CAAC;YACV,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,UAAU,GAAwB,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC;QAEtE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,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;QACjC,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YACtC,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YACtC,CAAC;QACH,CAAC;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,CAAC;YAC9B,IAAI,IAAA,kCAAe,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;gBACnC,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA/CD,sBA+CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cred-helpers.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/cred-helpers.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAG3D,MAAa,WAAY,SAAQ,wCAAkB;IAC1C,OAAO;QACZ,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,yBAAyB,CAAC,QAAgB,EAAE,YAAoC;QACrF,IAAI,YAAY,CAAC,WAAW,KAAK,SAAS,IAAI,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"cred-helpers.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/cred-helpers.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAG3D,MAAa,WAAY,SAAQ,wCAAkB;IAC1C,OAAO;QACZ,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,yBAAyB,CAAC,QAAgB,EAAE,YAAoC;QACrF,IAAI,YAAY,CAAC,WAAW,KAAK,SAAS,IAAI,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;YAC/F,OAAO,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;CACF;AAVD,kCAUC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-provider.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/credential-provider.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAC5C,yCAAmC;AAEnC,yDAAqD;AAQrD,MAAsB,kBAAkB;IAKtC,KAAK,CAAC,aAAa,CAAC,QAAgB,EAAE,YAAoC;QACxE,MAAM,sBAAsB,GAAG,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACtF,IAAI,CAAC,sBAAsB,EAAE;
|
|
1
|
+
{"version":3,"file":"credential-provider.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/credential-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"creds-store.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/creds-store.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAG3D,MAAa,UAAW,SAAQ,wCAAkB;IACzC,OAAO;QACZ,OAAO,YAAY,CAAC;IACtB,CAAC;IAEM,yBAAyB,CAAC,QAAgB,EAAE,YAAoC;QACrF,IAAI,YAAY,CAAC,UAAU,KAAK,SAAS,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"creds-store.js","sourceRoot":"","sources":["../../../src/container-runtime/auth/creds-store.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAG3D,MAAa,UAAW,SAAQ,wCAAkB;IACzC,OAAO;QACZ,OAAO,YAAY,CAAC;IACtB,CAAC;IAEM,yBAAyB,CAAC,QAAgB,EAAE,YAAoC;QACrF,IAAI,YAAY,CAAC,UAAU,KAAK,SAAS,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChF,OAAO,YAAY,CAAC,UAAU,CAAC;QACjC,CAAC;IACH,CAAC;CACF;AAVD,gCAUC"}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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,CAAC;QACnC,OAAO,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC3D,CAAC;SAAM,IAAI,IAAA,eAAU,EAAC,gBAAgB,CAAC,EAAE,CAAC;QACxC,OAAO,iBAAiB,CAAC,CAAC,MAAM,IAAA,mBAAQ,EAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1E,CAAC;SAAM,CAAC;QACN,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;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,CAAC;QAC7B,YAAG,CAAC,KAAK,CAAC,uCAAuC,QAAQ,GAAG,CAAC,CAAC;QAC9D,OAAO,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,MAAM,mBAAmB,IAAI,oBAAoB,EAAE,CAAC;QACvD,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,YAAY,CAAC,CAAC;QAEzF,IAAI,UAAU,EAAE,CAAC;YACf,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;QACpB,CAAC;IACH,CAAC;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"}
|
|
@@ -3,7 +3,8 @@ 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.
|
|
6
|
+
exports.ContainerRuntimeClient = void 0;
|
|
7
|
+
exports.getContainerRuntimeClient = getContainerRuntimeClient;
|
|
7
8
|
const dockerode_1 = __importDefault(require("dockerode"));
|
|
8
9
|
const common_1 = require("../../common");
|
|
9
10
|
const version_1 = require("../../version");
|
|
@@ -65,7 +66,6 @@ async function getContainerRuntimeClient() {
|
|
|
65
66
|
}
|
|
66
67
|
throw new Error("Could not find a working container runtime strategy");
|
|
67
68
|
}
|
|
68
|
-
exports.getContainerRuntimeClient = getContainerRuntimeClient;
|
|
69
69
|
async function initStrategy(strategy) {
|
|
70
70
|
const result = await strategy.getResult();
|
|
71
71
|
if (!result) {
|
|
@@ -113,8 +113,7 @@ async function initStrategy(strategy) {
|
|
|
113
113
|
runtimes: dockerodeInfo.Runtimes ? Object.keys(dockerodeInfo.Runtimes) : [],
|
|
114
114
|
labels: dockerodeInfo.Labels ? dockerodeInfo.Labels : [],
|
|
115
115
|
};
|
|
116
|
-
const
|
|
117
|
-
const info = { node: nodeInfo, containerRuntime: containerRuntimeInfo, compose: composeInfo };
|
|
116
|
+
const info = { node: nodeInfo, containerRuntime: containerRuntimeInfo };
|
|
118
117
|
common_1.log.trace(`Container runtime info:\n${JSON.stringify(info, null, 2)}`);
|
|
119
118
|
return new ContainerRuntimeClient(info, composeClient, containerClient, imageClient, networkClient);
|
|
120
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/container-runtime/clients/client.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/container-runtime/clients/client.ts"],"names":[],"mappings":";;;;;;AAiCA,8DA8BC;AA/DD,0DAAqD;AACrD,yCAA6D;AAC7D,2CAA4C;AAC5C,iFAA6E;AAC7E,+EAA0E;AAC1E,+FAAyF;AAEzF,6FAAwF;AACxF,6EAAwE;AACxE,8DAAyD;AACzD,wGAAoG;AACpG,wDAAoD;AACpD,6DAA2E;AAE3E,iFAA4E;AAC5E,qEAAgE;AAEhE,2EAAsE;AAItE,MAAa,sBAAsB;IAEf;IACA;IACA;IACA;IACA;IALlB,YACkB,IAAU,EACV,OAAsB,EACtB,SAA0B,EAC1B,KAAkB,EAClB,OAAsB;QAJtB,SAAI,GAAJ,IAAI,CAAM;QACV,YAAO,GAAP,OAAO,CAAe;QACtB,cAAS,GAAT,SAAS,CAAiB;QAC1B,UAAK,GAAL,KAAK,CAAa;QAClB,YAAO,GAAP,OAAO,CAAe;IACrC,CAAC;CACL;AARD,wDAQC;AAED,IAAI,sBAA8C,CAAC;AAE5C,KAAK,UAAU,yBAAyB;IAC7C,IAAI,sBAAsB,EAAE,CAAC;QAC3B,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,MAAM,UAAU,GAAqC;QACnD,IAAI,yDAA0B,EAAE;QAChC,IAAI,8CAAqB,EAAE;QAC3B,IAAI,yCAAkB,EAAE;QACxB,IAAI,0DAA0B,EAAE;QAChC,IAAI,2CAAmB,EAAE;KAC1B,CAAC;IAEF,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,YAAG,CAAC,KAAK,CAAC,wCAAwC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5E,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,MAAM,EAAE,CAAC;gBACX,YAAG,CAAC,KAAK,CAAC,+BAA+B,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBACtE,sBAAsB,GAAG,MAAM,CAAC;gBAChC,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,YAAG,CAAC,KAAK,CAAC,+BAA+B,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,GAAG,CAAC,CAAC;YACxF,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC/F,YAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;AACzE,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,QAAwC;IAClE,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC;IAE1C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,YAAG,CAAC,KAAK,CAAC,+BAA+B,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;QAClF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,gBAAgB,GAAkB;QACtC,GAAG,MAAM,CAAC,aAAa;QACvB,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,WAAW,qBAAW,EAAE,EAAE;KACrF,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,gBAAgB,CAAC,CAAC;IAElD,YAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IACrC,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;IAE7C,MAAM,kBAAkB,GACtB,CAAC,IAAA,kBAAS,EAAC,aAAa,CAAC,kBAAkB,CAAC,IAAI,IAAA,sBAAa,EAAC,aAAa,CAAC,kBAAkB,CAAC;QAC7F,CAAC,CAAC,6BAA6B;QAC/B,CAAC,CAAC,aAAa,CAAC,kBAAkB,CAAC;IAEvC,YAAG,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;IAC9D,MAAM,gCAAgC,GAAG,IAAA,0EAAmC,EAAC,MAAM,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAEpH,YAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAW,EAAC,SAAS,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAEtE,YAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACtC,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAgB,EAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAExE,MAAM,QAAQ,GAAa;QACzB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,YAAY,EAAE,OAAO,CAAC,IAAI;QAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC;IAEF,YAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAa,EAAC,IAAI,CAAC,CAAC;IAE1C,YAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IACrC,MAAM,eAAe,GAAG,IAAI,+CAAqB,CAAC,SAAS,CAAC,CAAC;IAC7D,MAAM,WAAW,GAAG,IAAI,uCAAiB,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IACzE,MAAM,aAAa,GAAG,IAAI,2CAAmB,CAAC,SAAS,CAAC,CAAC;IAEzD,MAAM,oBAAoB,GAAyB;QACjD,IAAI;QACJ,OAAO;QACP,gBAAgB,EAAE,gCAAgC;QAClD,kBAAkB,EAAE,kBAAkB;QACtC,aAAa,EAAE,aAAa,CAAC,aAAa;QAC1C,eAAe,EAAE,aAAa,CAAC,eAAe;QAC9C,mBAAmB,EAAE,aAAa,CAAC,MAAM;QACzC,YAAY,EAAE,aAAa,CAAC,YAAY;QACxC,IAAI,EAAE,aAAa,CAAC,IAAI;QACxB,MAAM,EAAE,aAAa,CAAC,QAAQ;QAC9B,QAAQ,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;QAC3E,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;KACzD,CAAC;IAEF,MAAM,IAAI,GAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,CAAC;IAE9E,YAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACvE,OAAO,IAAI,sBAAsB,CAAC,IAAI,EAAE,aAAa,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;AACtG,CAAC"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
import { ComposeInfo } from "../types";
|
|
3
1
|
import { ComposeDownOptions, ComposeOptions } from "./types";
|
|
4
2
|
export interface ComposeClient {
|
|
5
|
-
info: ComposeInfo;
|
|
6
3
|
up(options: ComposeOptions, services?: Array<string>): Promise<void>;
|
|
7
4
|
pull(options: ComposeOptions, services?: Array<string>): Promise<void>;
|
|
8
5
|
stop(options: ComposeOptions): Promise<void>;
|
|
@@ -1,79 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
4
|
};
|
|
25
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.getComposeClient =
|
|
27
|
-
const docker_compose_1 =
|
|
6
|
+
exports.getComposeClient = getComposeClient;
|
|
7
|
+
const docker_compose_1 = __importDefault(require("docker-compose"));
|
|
28
8
|
const common_1 = require("../../../common");
|
|
29
9
|
const default_compose_options_1 = require("./default-compose-options");
|
|
30
10
|
async function getComposeClient(environment) {
|
|
31
|
-
const info = await getComposeInfo();
|
|
32
|
-
switch (info?.compatability) {
|
|
33
|
-
case undefined:
|
|
34
|
-
return new MissingComposeClient();
|
|
35
|
-
case "v1":
|
|
36
|
-
return new ComposeV1Client(info, environment);
|
|
37
|
-
case "v2":
|
|
38
|
-
return new ComposeV2Client(info, environment);
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
exports.getComposeClient = getComposeClient;
|
|
42
|
-
async function getComposeInfo() {
|
|
43
11
|
try {
|
|
44
|
-
return
|
|
45
|
-
version: (await docker_compose_1.v2.version()).data.version,
|
|
46
|
-
compatability: "v2",
|
|
47
|
-
};
|
|
12
|
+
return new DockerComposeClient(environment);
|
|
48
13
|
}
|
|
49
14
|
catch (err) {
|
|
50
|
-
|
|
51
|
-
return {
|
|
52
|
-
version: (await docker_compose_1.default.version()).data.version,
|
|
53
|
-
compatability: "v1",
|
|
54
|
-
};
|
|
55
|
-
}
|
|
56
|
-
catch {
|
|
57
|
-
return undefined;
|
|
58
|
-
}
|
|
15
|
+
return new MissingComposeClient();
|
|
59
16
|
}
|
|
60
17
|
}
|
|
61
|
-
class
|
|
62
|
-
info;
|
|
18
|
+
class DockerComposeClient {
|
|
63
19
|
environment;
|
|
64
|
-
constructor(
|
|
65
|
-
this.info = info;
|
|
20
|
+
constructor(environment) {
|
|
66
21
|
this.environment = environment;
|
|
67
22
|
}
|
|
68
23
|
async up(options, services) {
|
|
69
24
|
try {
|
|
70
25
|
if (services) {
|
|
71
26
|
common_1.log.info(`Upping Compose environment services ${services.join(", ")}...`);
|
|
72
|
-
await docker_compose_1.default.upMany(services,
|
|
27
|
+
await docker_compose_1.default.upMany(services, (0, default_compose_options_1.defaultComposeOptions)(this.environment, options));
|
|
73
28
|
}
|
|
74
29
|
else {
|
|
75
30
|
common_1.log.info(`Upping Compose environment...`);
|
|
76
|
-
await docker_compose_1.default.upAll(
|
|
31
|
+
await docker_compose_1.default.upAll((0, default_compose_options_1.defaultComposeOptions)(this.environment, options));
|
|
77
32
|
}
|
|
78
33
|
common_1.log.info(`Upped Compose environment`);
|
|
79
34
|
}
|
|
@@ -93,11 +48,11 @@ class ComposeV1Client {
|
|
|
93
48
|
try {
|
|
94
49
|
if (services) {
|
|
95
50
|
common_1.log.info(`Pulling Compose environment images "${services.join('", "')}"...`);
|
|
96
|
-
await docker_compose_1.default.pullMany(services,
|
|
51
|
+
await docker_compose_1.default.pullMany(services, (0, default_compose_options_1.defaultComposeOptions)(this.environment, { ...options, logger: common_1.pullLog }));
|
|
97
52
|
}
|
|
98
53
|
else {
|
|
99
54
|
common_1.log.info(`Pulling Compose environment images...`);
|
|
100
|
-
await docker_compose_1.default.pullAll(
|
|
55
|
+
await docker_compose_1.default.pullAll((0, default_compose_options_1.defaultComposeOptions)(this.environment, { ...options, logger: common_1.pullLog }));
|
|
101
56
|
}
|
|
102
57
|
common_1.log.info(`Pulled Compose environment`);
|
|
103
58
|
}
|
|
@@ -108,7 +63,7 @@ class ComposeV1Client {
|
|
|
108
63
|
async stop(options) {
|
|
109
64
|
try {
|
|
110
65
|
common_1.log.info(`Stopping Compose environment...`);
|
|
111
|
-
await docker_compose_1.default.stop(
|
|
66
|
+
await docker_compose_1.default.stop((0, default_compose_options_1.defaultComposeOptions)(this.environment, options));
|
|
112
67
|
common_1.log.info(`Stopped Compose environment`);
|
|
113
68
|
}
|
|
114
69
|
catch (err) {
|
|
@@ -119,78 +74,7 @@ class ComposeV1Client {
|
|
|
119
74
|
try {
|
|
120
75
|
common_1.log.info(`Downing Compose environment...`);
|
|
121
76
|
await docker_compose_1.default.down({
|
|
122
|
-
...(
|
|
123
|
-
commandOptions: composeDownCommandOptions(downOptions),
|
|
124
|
-
});
|
|
125
|
-
common_1.log.info(`Downed Compose environment`);
|
|
126
|
-
}
|
|
127
|
-
catch (err) {
|
|
128
|
-
await handleAndRethrow(err, async (error) => common_1.log.error(`Failed to down Compose environment: ${error.message}`));
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
class ComposeV2Client {
|
|
133
|
-
info;
|
|
134
|
-
environment;
|
|
135
|
-
constructor(info, environment) {
|
|
136
|
-
this.info = info;
|
|
137
|
-
this.environment = environment;
|
|
138
|
-
}
|
|
139
|
-
async up(options, services) {
|
|
140
|
-
try {
|
|
141
|
-
if (services) {
|
|
142
|
-
common_1.log.info(`Upping Compose environment services ${services.join(", ")}...`);
|
|
143
|
-
await docker_compose_1.v2.upMany(services, await (0, default_compose_options_1.defaultComposeOptions)(this.environment, options));
|
|
144
|
-
}
|
|
145
|
-
else {
|
|
146
|
-
common_1.log.info(`Upping Compose environment...`);
|
|
147
|
-
await docker_compose_1.v2.upAll(await (0, default_compose_options_1.defaultComposeOptions)(this.environment, options));
|
|
148
|
-
}
|
|
149
|
-
common_1.log.info(`Upped Compose environment`);
|
|
150
|
-
}
|
|
151
|
-
catch (err) {
|
|
152
|
-
await handleAndRethrow(err, async (error) => {
|
|
153
|
-
try {
|
|
154
|
-
common_1.log.error(`Failed to up Compose environment: ${error.message}`);
|
|
155
|
-
await this.down(options, { removeVolumes: true, timeout: 0 });
|
|
156
|
-
}
|
|
157
|
-
catch {
|
|
158
|
-
common_1.log.error(`Failed to down Compose environment after failed up`);
|
|
159
|
-
}
|
|
160
|
-
});
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
async pull(options, services) {
|
|
164
|
-
try {
|
|
165
|
-
if (services) {
|
|
166
|
-
common_1.log.info(`Pulling Compose environment images "${services.join('", "')}"...`);
|
|
167
|
-
await docker_compose_1.v2.pullMany(services, await (0, default_compose_options_1.defaultComposeOptions)(this.environment, { ...options, logger: common_1.pullLog }));
|
|
168
|
-
}
|
|
169
|
-
else {
|
|
170
|
-
common_1.log.info(`Pulling Compose environment images...`);
|
|
171
|
-
await docker_compose_1.v2.pullAll(await (0, default_compose_options_1.defaultComposeOptions)(this.environment, { ...options, logger: common_1.pullLog }));
|
|
172
|
-
}
|
|
173
|
-
common_1.log.info(`Pulled Compose environment`);
|
|
174
|
-
}
|
|
175
|
-
catch (err) {
|
|
176
|
-
await handleAndRethrow(err, async (error) => common_1.log.error(`Failed to pull Compose environment images: ${error.message}`));
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
async stop(options) {
|
|
180
|
-
try {
|
|
181
|
-
common_1.log.info(`Stopping Compose environment...`);
|
|
182
|
-
await docker_compose_1.v2.stop(await (0, default_compose_options_1.defaultComposeOptions)(this.environment, options));
|
|
183
|
-
common_1.log.info(`Stopped Compose environment`);
|
|
184
|
-
}
|
|
185
|
-
catch (err) {
|
|
186
|
-
await handleAndRethrow(err, async (error) => common_1.log.error(`Failed to stop Compose environment: ${error.message}`));
|
|
187
|
-
}
|
|
188
|
-
}
|
|
189
|
-
async down(options, downOptions) {
|
|
190
|
-
try {
|
|
191
|
-
common_1.log.info(`Downing Compose environment...`);
|
|
192
|
-
await docker_compose_1.v2.down({
|
|
193
|
-
...(await (0, default_compose_options_1.defaultComposeOptions)(this.environment, options)),
|
|
77
|
+
...(0, default_compose_options_1.defaultComposeOptions)(this.environment, options),
|
|
194
78
|
commandOptions: composeDownCommandOptions(downOptions),
|
|
195
79
|
});
|
|
196
80
|
common_1.log.info(`Downed Compose environment`);
|
|
@@ -201,7 +85,7 @@ class ComposeV2Client {
|
|
|
201
85
|
}
|
|
202
86
|
}
|
|
203
87
|
class MissingComposeClient {
|
|
204
|
-
|
|
88
|
+
constructor() { }
|
|
205
89
|
up() {
|
|
206
90
|
throw new Error("Compose is not installed");
|
|
207
91
|
}
|
|
@@ -227,7 +111,7 @@ function composeDownCommandOptions(options) {
|
|
|
227
111
|
result.push("-v");
|
|
228
112
|
}
|
|
229
113
|
if (options.timeout) {
|
|
230
|
-
result.push("-t", `${options.timeout
|
|
114
|
+
result.push("-t", `${(0, common_1.toSeconds)(options.timeout)}`);
|
|
231
115
|
}
|
|
232
116
|
return result;
|
|
233
117
|
}
|
|
@@ -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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"}
|