@cardano-sdk/util-dev 0.13.4 → 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 +4 -4
package/dist/esm/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/esm/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/esm/docker.js
CHANGED
|
@@ -7,7 +7,7 @@ const CONTAINER_NAME = 'cardano-test';
|
|
|
7
7
|
export const removePostgresContainer = async () => {
|
|
8
8
|
const docker = new Docker();
|
|
9
9
|
try {
|
|
10
|
-
const container =
|
|
10
|
+
const container = docker.getContainer(CONTAINER_NAME);
|
|
11
11
|
try {
|
|
12
12
|
await container.stop();
|
|
13
13
|
}
|
|
@@ -22,21 +22,14 @@ export const removePostgresContainer = async () => {
|
|
|
22
22
|
throw error;
|
|
23
23
|
}
|
|
24
24
|
};
|
|
25
|
-
|
|
25
|
+
const ensurePgServiceReadiness = async (container, user, db) => {
|
|
26
26
|
await containerExec(container, [
|
|
27
27
|
'bash',
|
|
28
28
|
'-c',
|
|
29
|
-
`until psql -U ${user}
|
|
29
|
+
`until psql -U ${user} ${db} -c "SELECT 1" > /dev/null 2>&1 ; do echo "waiting pg service to be ready"; sleep 1; done`
|
|
30
30
|
]);
|
|
31
31
|
};
|
|
32
|
-
const
|
|
33
|
-
await containerExec(container, [
|
|
34
|
-
'bash',
|
|
35
|
-
'-c',
|
|
36
|
-
`until psql -U ${user} -c "SELECT 1" > /dev/null 2>&1 ; do echo "waiting pg service to be ready"; sleep 1; done`
|
|
37
|
-
]);
|
|
38
|
-
};
|
|
39
|
-
export const setupPostgresContainer = async (user, password, port) => {
|
|
32
|
+
export const setupPostgresContainer = async (user, password, port, binds, checkDb) => {
|
|
40
33
|
const docker = new Docker();
|
|
41
34
|
const needsToPull = !(await imageExists(docker, CONTAINER_IMAGE));
|
|
42
35
|
if (needsToPull)
|
|
@@ -45,6 +38,7 @@ export const setupPostgresContainer = async (user, password, port) => {
|
|
|
45
38
|
const container = await docker.createContainer({
|
|
46
39
|
Env: [`POSTGRES_PASSWORD=${password}`, `POSTGRES_USER=${user}`],
|
|
47
40
|
HostConfig: {
|
|
41
|
+
Binds: binds,
|
|
48
42
|
PortBindings: {
|
|
49
43
|
'5432/tcp': [
|
|
50
44
|
{
|
|
@@ -57,7 +51,7 @@ export const setupPostgresContainer = async (user, password, port) => {
|
|
|
57
51
|
name: CONTAINER_NAME
|
|
58
52
|
});
|
|
59
53
|
await container.start();
|
|
60
|
-
await ensurePgServiceReadiness(container, user);
|
|
54
|
+
await ensurePgServiceReadiness(container, user, checkDb);
|
|
61
55
|
return container;
|
|
62
56
|
};
|
|
63
57
|
//# sourceMappingURL=docker.js.map
|
package/dist/esm/docker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../src/docker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,MAAM,MAAM,WAAW,CAAC;AAE/B,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAC/C,MAAM,cAAc,GAAG,cAAc,CAAC;AAEtC,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,IAAmB,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;IAC5B,IAAI;QACF,MAAM,SAAS,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../src/docker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,MAAM,MAAM,WAAW,CAAC;AAE/B,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAC/C,MAAM,cAAc,GAAG,cAAc,CAAC;AAEtC,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,IAAmB,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,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;AAEF,MAAM,wBAAwB,GAAG,KAAK,EAAE,SAA2B,EAAE,IAAY,EAAE,EAAU,EAAE,EAAE;IAC/F,MAAM,aAAa,CAAC,SAAS,EAAE;QAC7B,MAAM;QACN,IAAI;QACJ,iBAAiB,IAAI,IAAI,EAAE,2FAA2F;KACvH,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,IAAY,EACZ,QAAgB,EAChB,IAAY,EACZ,KAAiC,EACjC,OAAe,EACf,EAAE;IACF,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;IAC5B,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAElE,IAAI,WAAW;QAAE,MAAM,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAE/D,MAAM,uBAAuB,EAAE,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"}
|