@cardano-sdk/util-dev 0.13.5 → 0.13.6
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/dist/cjs/docker.d.ts +1 -2
- package/dist/cjs/docker.d.ts.map +1 -1
- package/dist/cjs/docker.js +7 -14
- package/dist/cjs/docker.js.map +1 -1
- package/dist/cjs/tsconfig.tsbuildinfo +1 -1
- package/dist/esm/docker.d.ts +1 -2
- package/dist/esm/docker.d.ts.map +1 -1
- package/dist/esm/docker.js +6 -12
- package/dist/esm/docker.js.map +1 -1
- package/dist/esm/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
package/dist/cjs/docker.d.ts
CHANGED
|
@@ -2,6 +2,5 @@ import Docker from 'dockerode';
|
|
|
2
2
|
export { Docker };
|
|
3
3
|
export { containerExec } from 'dockerode-utils';
|
|
4
4
|
export declare const removePostgresContainer: () => Promise<void>;
|
|
5
|
-
export declare const
|
|
6
|
-
export declare const setupPostgresContainer: (user: string, password: string, port: string) => Promise<Docker.Container>;
|
|
5
|
+
export declare const setupPostgresContainer: (user: string, password: string, port: string, binds: Docker.HostConfig['Binds'], checkDb: string) => Promise<Docker.Container>;
|
|
7
6
|
//# sourceMappingURL=docker.d.ts.map
|
package/dist/cjs/docker.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../src/docker.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,WAAW,CAAC;AAE/B,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAKhD,eAAO,MAAM,uBAAuB,QAAa,QAAQ,IAAI,CAiB5D,CAAC;
|
|
1
|
+
{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../src/docker.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,WAAW,CAAC;AAE/B,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAKhD,eAAO,MAAM,uBAAuB,QAAa,QAAQ,IAAI,CAiB5D,CAAC;AAUF,eAAO,MAAM,sBAAsB,SAC3B,MAAM,YACF,MAAM,QACV,MAAM,SACL,OAAO,UAAU,CAAC,OAAO,CAAC,WACxB,MAAM,8BA4BhB,CAAC"}
|
package/dist/cjs/docker.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.setupPostgresContainer = exports.
|
|
6
|
+
exports.setupPostgresContainer = exports.removePostgresContainer = exports.containerExec = exports.Docker = void 0;
|
|
7
7
|
const dockerode_utils_1 = require("dockerode-utils");
|
|
8
8
|
const dockerode_1 = __importDefault(require("dockerode"));
|
|
9
9
|
exports.Docker = dockerode_1.default;
|
|
@@ -14,7 +14,7 @@ const CONTAINER_NAME = 'cardano-test';
|
|
|
14
14
|
const removePostgresContainer = async () => {
|
|
15
15
|
const docker = new dockerode_1.default();
|
|
16
16
|
try {
|
|
17
|
-
const container =
|
|
17
|
+
const container = docker.getContainer(CONTAINER_NAME);
|
|
18
18
|
try {
|
|
19
19
|
await container.stop();
|
|
20
20
|
}
|
|
@@ -30,22 +30,14 @@ const removePostgresContainer = async () => {
|
|
|
30
30
|
}
|
|
31
31
|
};
|
|
32
32
|
exports.removePostgresContainer = removePostgresContainer;
|
|
33
|
-
const
|
|
33
|
+
const ensurePgServiceReadiness = async (container, user, db) => {
|
|
34
34
|
await (0, dockerode_utils_1.containerExec)(container, [
|
|
35
35
|
'bash',
|
|
36
36
|
'-c',
|
|
37
|
-
`until psql -U ${user}
|
|
37
|
+
`until psql -U ${user} ${db} -c "SELECT 1" > /dev/null 2>&1 ; do echo "waiting pg service to be ready"; sleep 1; done`
|
|
38
38
|
]);
|
|
39
39
|
};
|
|
40
|
-
|
|
41
|
-
const ensurePgServiceReadiness = async (container, user) => {
|
|
42
|
-
await (0, dockerode_utils_1.containerExec)(container, [
|
|
43
|
-
'bash',
|
|
44
|
-
'-c',
|
|
45
|
-
`until psql -U ${user} -c "SELECT 1" > /dev/null 2>&1 ; do echo "waiting pg service to be ready"; sleep 1; done`
|
|
46
|
-
]);
|
|
47
|
-
};
|
|
48
|
-
const setupPostgresContainer = async (user, password, port) => {
|
|
40
|
+
const setupPostgresContainer = async (user, password, port, binds, checkDb) => {
|
|
49
41
|
const docker = new dockerode_1.default();
|
|
50
42
|
const needsToPull = !(await (0, dockerode_utils_1.imageExists)(docker, CONTAINER_IMAGE));
|
|
51
43
|
if (needsToPull)
|
|
@@ -54,6 +46,7 @@ const setupPostgresContainer = async (user, password, port) => {
|
|
|
54
46
|
const container = await docker.createContainer({
|
|
55
47
|
Env: [`POSTGRES_PASSWORD=${password}`, `POSTGRES_USER=${user}`],
|
|
56
48
|
HostConfig: {
|
|
49
|
+
Binds: binds,
|
|
57
50
|
PortBindings: {
|
|
58
51
|
'5432/tcp': [
|
|
59
52
|
{
|
|
@@ -66,7 +59,7 @@ const setupPostgresContainer = async (user, password, port) => {
|
|
|
66
59
|
name: CONTAINER_NAME
|
|
67
60
|
});
|
|
68
61
|
await container.start();
|
|
69
|
-
await ensurePgServiceReadiness(container, user);
|
|
62
|
+
await ensurePgServiceReadiness(container, user, checkDb);
|
|
70
63
|
return container;
|
|
71
64
|
};
|
|
72
65
|
exports.setupPostgresContainer = setupPostgresContainer;
|
package/dist/cjs/docker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../src/docker.ts"],"names":[],"mappings":";;;;;;AAAA,qDAA6E;AAC7E,0DAA+B;AAEtB,iBAFF,mBAAM,CAEE;AACf,mDAAgD;AAAvC,gHAAA,aAAa,OAAA;AAEtB,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAC/C,MAAM,cAAc,GAAG,cAAc,CAAC;AAE/B,MAAM,uBAAuB,GAAG,KAAK,IAAmB,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAI,mBAAM,EAAE,CAAC;IAC5B,IAAI;QACF,MAAM,SAAS,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../src/docker.ts"],"names":[],"mappings":";;;;;;AAAA,qDAA6E;AAC7E,0DAA+B;AAEtB,iBAFF,mBAAM,CAEE;AACf,mDAAgD;AAAvC,gHAAA,aAAa,OAAA;AAEtB,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAC/C,MAAM,cAAc,GAAG,cAAc,CAAC;AAE/B,MAAM,uBAAuB,GAAG,KAAK,IAAmB,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAI,mBAAM,EAAE,CAAC;IAC5B,IAAI;QACF,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACtD,IAAI;YACF,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;SAExB;QAAC,OAAO,KAAU,EAAE;YAEnB,IAAI,KAAK,CAAC,UAAU,KAAK,GAAG;gBAAE,MAAM,KAAK,CAAC;SAC3C;QACD,MAAM,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;KAErC;IAAC,OAAO,KAAU,EAAE;QAEnB,IAAI,KAAK,CAAC,UAAU,KAAK,GAAG;YAAE,MAAM,KAAK,CAAC;KAC3C;AACH,CAAC,CAAC;AAjBW,QAAA,uBAAuB,2BAiBlC;AAEF,MAAM,wBAAwB,GAAG,KAAK,EAAE,SAA2B,EAAE,IAAY,EAAE,EAAU,EAAE,EAAE;IAC/F,MAAM,IAAA,+BAAa,EAAC,SAAS,EAAE;QAC7B,MAAM;QACN,IAAI;QACJ,iBAAiB,IAAI,IAAI,EAAE,2FAA2F;KACvH,CAAC,CAAC;AACL,CAAC,CAAC;AAEK,MAAM,sBAAsB,GAAG,KAAK,EACzC,IAAY,EACZ,QAAgB,EAChB,IAAY,EACZ,KAAiC,EACjC,OAAe,EACf,EAAE;IACF,MAAM,MAAM,GAAG,IAAI,mBAAM,EAAE,CAAC;IAC5B,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,IAAA,6BAAW,EAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAElE,IAAI,WAAW;QAAE,MAAM,IAAA,gCAAc,EAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAE/D,MAAM,IAAA,+BAAuB,GAAE,CAAC;IAEhC,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC;QAC7C,GAAG,EAAE,CAAC,qBAAqB,QAAQ,EAAE,EAAE,iBAAiB,IAAI,EAAE,CAAC;QAC/D,UAAU,EAAE;YACV,KAAK,EAAE,KAAK;YACZ,YAAY,EAAE;gBACZ,UAAU,EAAE;oBACV;wBACE,QAAQ,EAAE,IAAI;qBACf;iBACF;aACF;SACF;QACD,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,cAAc;KACrB,CAAC,CAAC;IACH,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IAExB,MAAM,wBAAwB,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACzD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAjCW,QAAA,sBAAsB,0BAiCjC"}
|