Skip to content

Commit f47af2e

Browse files
committed
update @types/dockerode
1 parent 7352220 commit f47af2e

File tree

4 files changed

+10
-19
lines changed

4 files changed

+10
-19
lines changed

package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/testcontainers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"dependencies": {
3333
"@balena/dockerignore": "^1.0.2",
34-
"@types/dockerode": "^3.3.42",
34+
"@types/dockerode": "^3.3.43",
3535
"archiver": "^7.0.1",
3636
"async-lock": "^1.4.1",
3737
"byline": "^5.0.0",

packages/testcontainers/src/docker-compose-environment/docker-compose-environment.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ContainerInfo, ContainerInspectInfo, HealthConfig } from "dockerode";
1+
import { ContainerInfo, ContainerInspectInfo } from "dockerode";
22
import { containerLog, log, RandomUuid, Uuid } from "../common";
33
import { ComposeOptions, getContainerRuntimeClient, parseComposeContainerName } from "../container-runtime";
44
import { StartedGenericContainer } from "../generic-container/started-generic-container";
@@ -211,13 +211,7 @@ export class DockerComposeEnvironment {
211211
? this.waitStrategy[containerName]
212212
: this.defaultWaitStrategy;
213213
if (containerWaitStrategy) return containerWaitStrategy;
214-
const healthcheck = (
215-
inspectResult as ContainerInspectInfo & {
216-
Config: ContainerInspectInfo["Config"] & {
217-
Healthcheck: HealthConfig | undefined;
218-
};
219-
}
220-
).Config.Healthcheck;
214+
const healthcheck = inspectResult.Config.Healthcheck;
221215
if (healthcheck?.Test) {
222216
return Wait.forHealthCheck();
223217
}

packages/testcontainers/src/generic-container/generic-container.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import archiver from "archiver";
22
import AsyncLock from "async-lock";
3-
import { Container, ContainerCreateOptions, HealthConfig, HostConfig, ImageInspectInfo } from "dockerode";
3+
import { Container, ContainerCreateOptions, HostConfig } from "dockerode";
44
import { Readable } from "stream";
55
import { containerLog, hash, log, toNanos } from "../common";
66
import { ContainerRuntimeClient, getContainerRuntimeClient, ImageName } from "../container-runtime";
@@ -124,11 +124,7 @@ export class GenericContainer implements TestContainer {
124124
if (this.healthCheck) {
125125
return Wait.forHealthCheck();
126126
}
127-
const imageInfo = (await client.image.inspect(this.imageName)) as ImageInspectInfo & {
128-
Config: ImageInspectInfo["Config"] & {
129-
Healthcheck: HealthConfig | undefined;
130-
};
131-
};
127+
const imageInfo = await client.image.inspect(this.imageName);
132128
if (imageInfo.Config.Healthcheck?.Test) {
133129
return Wait.forHealthCheck();
134130
}

0 commit comments

Comments
 (0)