Update all dependencies

Author: cristianrgreco

package-lock.json

@@ -25,48 +25,53 @@
     "prepublish": "npm run build",
     "build": "npm run clean && tsc",
     "clean": "rimraf dist",
-    "test": "jest"
+    "test": "jest",
+    "format": "prettier --write package.json src/**/*.ts"
   },
   "dependencies": {
-    "@types/dockerode": "^2.5.24",
+    "@types/dockerode": "^2.5.33",
     "byline": "^5.0.0",
     "debug": "^4.1.1",
-    "default-gateway": "^5.0.2",
+    "default-gateway": "^6.0.1",
     "docker-compose": "^0.23.4",
-    "dockerode": "^2.5.8",
-    "get-port": "^4.2.0",
+    "dockerode": "^3.2.0",
+    "get-port": "^5.1.1",
     "glob": "^7.1.6",
     "node-duration": "^1.0.4",
     "stream-to-array": "^2.3.0",
-    "tar-fs": "^2.0.0"
+    "tar-fs": "^2.1.0"
   },
   "devDependencies": {
-    "@types/byline": "^4.2.31",
-    "@types/debug": "0.0.31",
-    "@types/default-gateway": "^3.0.0",
-    "@types/glob": "^7.1.2",
-    "@types/jest": "^23.3.14",
-    "@types/node-fetch": "^2.3.4",
+    "@types/byline": "^4.2.32",
+    "@types/debug": "4.1.5",
+    "@types/default-gateway": "^3.0.1",
+    "@types/glob": "^7.1.3",
+    "@types/jest": "^26.0.4",
+    "@types/node": "^14.0.18",
+    "@types/node-fetch": "^2.5.7",
     "@types/stream-to-array": "^2.3.0",
-    "@types/tar-fs": "^1.16.1",
+    "@types/tar-fs": "^2.0.0",
     "husky": "^4.2.5",
-    "jest": "^24.8.0",
+    "jest": "^26.1.0",
     "lint-staged": "^10.2.11",
     "node-fetch": "^2.6.0",
-    "prettier": "^1.17.1",
+    "prettier": "^2.0.5",
     "rimraf": "^3.0.2",
-    "ts-jest": "^24.0.2",
-    "ts-node": "^7.0.1",
-    "tslint": "^5.17.0",
+    "ts-jest": "^26.1.1",
+    "ts-node": "^8.10.2",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.5.1"
+    "typescript": "^3.9.6"
   },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
     }
   },
   "lint-staged": {
+    "package.json": [
+      "prettier --write"
+    ],
     "src/**/*.ts": [
       "prettier --write",
       "tslint --fix"

package.json

@@ -61,13 +61,13 @@ export class DockerodeContainer implements Container {
 
   public stop(options: StopOptions): Promise<void> {
     return this.container.stop({
-      t: options.timeout.get(TemporalUnit.SECONDS)
+      t: options.timeout.get(TemporalUnit.SECONDS),
     });
   }
 
   public remove(options: RemoveOptions): Promise<void> {
     return this.container.remove({
-      v: options.removeVolumes
+      v: options.removeVolumes,
     });
   }
 
@@ -76,7 +76,7 @@ export class DockerodeContainer implements Container {
       await this.container.exec({
         Cmd: options.cmd,
         AttachStdout: options.attachStdout,
-        AttachStderr: options.attachStderr
+        AttachStderr: options.attachStderr,
       })
     );
   }
@@ -86,7 +86,7 @@ export class DockerodeContainer implements Container {
       const options = {
         follow: true,
         stdout: true,
-        stderr: true
+        stderr: true,
       };
 
       this.container.logs(options, (err, stream) => {
@@ -110,7 +110,7 @@ export class DockerodeContainer implements Container {
       hostPorts: this.getHostPorts(inspectResult),
       internalPorts: this.getInternalPorts(inspectResult),
       name: this.getName(inspectResult),
-      healthCheckStatus: this.getHealthCheckStatus(inspectResult)
+      healthCheckStatus: this.getHealthCheckStatus(inspectResult),
     };
   }
 
@@ -119,13 +119,13 @@ export class DockerodeContainer implements Container {
   }
 
   private getInternalPorts(inspectInfo: ContainerInspectInfo): Port[] {
-    return Object.keys(inspectInfo.NetworkSettings.Ports).map(port => Number(port.split("/")[0]));
+    return Object.keys(inspectInfo.NetworkSettings.Ports).map((port) => Number(port.split("/")[0]));
   }
 
   private getHostPorts(inspectInfo: ContainerInspectInfo): Port[] {
     return Object.values(inspectInfo.NetworkSettings.Ports)
-      .filter(portsArray => portsArray !== null)
-      .map(portsArray => Number(portsArray[0].HostPort));
+      .filter((portsArray) => portsArray !== null)
+      .map((portsArray) => Number(portsArray[0].HostPort));
   }
 
   private getHealthCheckStatus(inspectResult: ContainerInspectInfo): HealthCheckStatus {

src/container.ts

@@ -118,7 +118,7 @@ export class DockerodeClient implements DockerClient {
   public async pull(repoTag: RepoTag, authConfig?: AuthConfig): Promise<void> {
     log.info(`Pulling image: ${repoTag}`);
     const stream = await this.dockerode.pull(repoTag.toString(), {
-      authconfig: authConfig
+      authconfig: authConfig,
     });
     await streamToArray(stream);
   }
@@ -140,16 +140,26 @@ export class DockerodeClient implements DockerClient {
         Binds: this.getBindMounts(options.bindMounts),
         Tmpfs: options.tmpFs,
         LogConfig: this.getLogConfig(options.useDefaultLogDriver),
-        Privileged: options.privilegedMode
-      }
+        Privileged: options.privilegedMode,
+      },
     });
 
     return new DockerodeContainer(dockerodeContainer);
   }
 
   public async createNetwork(options: CreateNetworkOptions): Promise<string> {
     log.info(`Creating network ${options.name}`);
-    const network: Network = await this.dockerode.createNetwork(options);
+    const network: Network = await this.dockerode.createNetwork({
+      Name: options.name,
+      CheckDuplicate: options.checkDuplicate,
+      Driver: options.driver,
+      Internal: options.internal,
+      Attachable: options.attachable,
+      Ingress: options.ingress,
+      EnableIPv6: options.enableIPv6,
+      Options: options.options,
+      Labels: options.labels,
+    });
     return network.id;
   }
 
@@ -171,7 +181,7 @@ export class DockerodeClient implements DockerClient {
     const exec = await container.exec({
       cmd: command,
       attachStdout: true,
-      attachStderr: true
+      attachStderr: true,
     });
 
     const stream = await exec.start();
@@ -189,11 +199,11 @@ export class DockerodeClient implements DockerClient {
   ): Promise<void> {
     log.info(`Building image '${repoTag.toString()}' with context '${context}'`);
     const dockerIgnoreFiles = await findDockerIgnoreFiles(context);
-    const tarStream = tar.pack(context, { ignore: name => dockerIgnoreFiles.has(name) });
+    const tarStream = tar.pack(context, { ignore: (name) => dockerIgnoreFiles.has(name) });
     const stream = await this.dockerode.buildImage(tarStream, {
       dockerfile: dockerfileName,
       buildargs: buildArgs,
-      t: repoTag.toString()
+      t: repoTag.toString(),
     });
     await streamToArray(stream);
   }
@@ -205,7 +215,7 @@ export class DockerodeClient implements DockerClient {
       if (this.isDanglingImage(image)) {
         return repoTags;
       }
-      const imageRepoTags = image.RepoTags.map(imageRepoTag => {
+      const imageRepoTags = image.RepoTags.map((imageRepoTag) => {
         const [imageName, tag] = imageRepoTag.split(":");
         return new RepoTag(imageName, tag);
       });
@@ -230,12 +240,9 @@ export class DockerodeClient implements DockerClient {
   }
 
   private getEnv(env: Env): DockerodeEnvironment {
-    return Object.entries(env).reduce(
-      (dockerodeEnvironment, [key, value]) => {
-        return [...dockerodeEnvironment, `${key}=${value}`];
-      },
-      [] as DockerodeEnvironment
-    );
+    return Object.entries(env).reduce((dockerodeEnvironment, [key, value]) => {
+      return [...dockerodeEnvironment, `${key}=${value}`];
+    }, [] as DockerodeEnvironment);
   }
 
   private getHealthCheck(healthCheck?: HealthCheck): DockerodeHealthCheck | undefined {
@@ -247,7 +254,7 @@ export class DockerodeClient implements DockerClient {
       Interval: healthCheck.interval ? this.toNanos(healthCheck.interval) : 0,
       Timeout: healthCheck.timeout ? this.toNanos(healthCheck.timeout) : 0,
       Retries: healthCheck.retries || 0,
-      StartPeriod: healthCheck.startPeriod ? this.toNanos(healthCheck.startPeriod) : 0
+      StartPeriod: healthCheck.startPeriod ? this.toNanos(healthCheck.startPeriod) : 0,
     };
   }
 
@@ -282,7 +289,7 @@ export class DockerodeClient implements DockerClient {
 
     return {
       Type: "json-file",
-      Config: {}
+      Config: {},
     };
   }
 }

src/docker-client.ts

@@ -15,7 +15,7 @@ describe("DockerComposeEnvironment", () => {
   };
 
   afterEach(async () => {
-    await Promise.all(managedEnvironments.map(async environment => await environment.down()));
+    await Promise.all(managedEnvironments.map(async (environment) => await environment.down()));
     managedEnvironments = [];
   });
 
@@ -37,7 +37,7 @@ describe("DockerComposeEnvironment", () => {
     );
 
     await Promise.all(
-      ["container_1", "another_container_1"].map(async containerName => {
+      ["container_1", "another_container_1"].map(async (containerName) => {
         const container = startedEnvironment.getContainer(containerName);
         const url = `http://${container.getContainerIpAddress()}:${container.getMappedPort(8080)}`;
         const response = await fetch(`${url}/hello-world`);
@@ -55,7 +55,7 @@ describe("DockerComposeEnvironment", () => {
     );
 
     await Promise.all(
-      ["container_1", "another_container_1"].map(async containerName => {
+      ["container_1", "another_container_1"].map(async (containerName) => {
         const container = startedEnvironment.getContainer(containerName);
         const url = `http://${container.getContainerIpAddress()}:${container.getMappedPort(8080)}`;
         const response = await fetch(`${url}/hello-world`);

src/docker-compose-environment.test.ts

@@ -15,7 +15,7 @@ import { HostPortWaitStrategy, WaitStrategy } from "./wait-strategy";
 const createDockerComposeOptions = (filePath: string, fileName: string): dockerCompose.IDockerComposeOptions => ({
   cwd: filePath,
   config: fileName,
-  log: false
+  log: false,
 });
 
 export class DockerComposeEnvironment {
@@ -44,30 +44,32 @@ export class DockerComposeEnvironment {
     await this.dockerComposeUp();
     const startedContainers = await this.findStartedContainers();
 
-    const startedGenericContainers = (await Promise.all(
-      startedContainers.map(async startedContainer => {
-        const container = await this.dockerClient.getContainer(startedContainer.Id);
-        const containerName = resolveDockerComposeContainerName(startedContainer.Names[0]);
-
-        (await container.logs())
-          .on("data", data => log.trace(`${containerName}: ${data}`))
-          .on("err", data => log.error(`${containerName}: ${data}`));
-
-        const inspectResult = await container.inspect();
-        const boundPorts = this.getBoundPorts(startedContainer);
-        const containerState = new ContainerState(inspectResult);
-
-        await this.waitForContainer(container, containerName, containerState, boundPorts);
-
-        return new StartedGenericContainer(
-          container,
-          this.dockerClient.getHost(),
-          boundPorts,
-          containerName,
-          this.dockerClient
-        );
-      })
-    )).reduce((map, startedGenericContainer) => {
+    const startedGenericContainers = (
+      await Promise.all(
+        startedContainers.map(async (startedContainer) => {
+          const container = await this.dockerClient.getContainer(startedContainer.Id);
+          const containerName = resolveDockerComposeContainerName(startedContainer.Names[0]);
+
+          (await container.logs())
+            .on("data", (data) => log.trace(`${containerName}: ${data}`))
+            .on("err", (data) => log.error(`${containerName}: ${data}`));
+
+          const inspectResult = await container.inspect();
+          const boundPorts = this.getBoundPorts(startedContainer);
+          const containerState = new ContainerState(inspectResult);
+
+          await this.waitForContainer(container, containerName, containerState, boundPorts);
+
+          return new StartedGenericContainer(
+            container,
+            this.dockerClient.getHost(),
+            boundPorts,
+            containerName,
+            this.dockerClient
+          );
+        })
+      )
+    ).reduce((map, startedGenericContainer) => {
       const containerName = startedGenericContainer.getName();
       return { ...map, [containerName]: startedGenericContainer };
     }, {});
@@ -91,12 +93,12 @@ export class DockerComposeEnvironment {
 
   private async findStartedContainers(): Promise<Dockerode.ContainerInfo[]> {
     const containers = await this.dockerClient.listContainers();
-    return containers.filter(container => container.Labels["com.docker.compose.version"] !== undefined);
+    return containers.filter((container) => container.Labels["com.docker.compose.version"] !== undefined);
   }
 
   private getBoundPorts(containerInfo: Dockerode.ContainerInfo): BoundPorts {
     const boundPorts = new BoundPorts();
-    containerInfo.Ports.forEach(port => boundPorts.setBinding(port.PrivatePort, port.PublicPort));
+    containerInfo.Ports.forEach((port) => boundPorts.setBinding(port.PrivatePort, port.PublicPort));
     return boundPorts;
   }
 

src/docker-compose-environment.ts

@@ -13,25 +13,24 @@ export const findDockerIgnoreFiles = async (context: string): Promise<Set<string
   const dockerIgnorePatterns = (await fs.readFile(dockerIgnoreFilePath, { encoding: "utf-8" }))
     .toString()
     .split("\n")
-    .map(dockerIgnorePattern => path.resolve(context, dockerIgnorePattern));
+    .map((dockerIgnorePattern) => path.resolve(context, dockerIgnorePattern));
 
   const dockerIgnoreMatches: string[][] = await Promise.all(
-    dockerIgnorePatterns.map(
-      dockerIgnorePattern =>
-        new Promise((resolve, reject) =>
-          glob(dockerIgnorePattern, (err, matches) => {
-            if (err) {
-              return reject(err);
-            } else {
-              resolve(matches);
-            }
-          })
-        )
-    )
+    dockerIgnorePatterns.map((dockerIgnorePattern) => {
+      return new Promise((resolve, reject) =>
+        glob(dockerIgnorePattern, (err, matches) => {
+          if (err) {
+            return reject(err);
+          } else {
+            resolve(matches);
+          }
+        })
+      ) as Promise<string[]>;
+    })
   );
 
-  dockerIgnoreMatches.forEach(dockerIgnoreFileBatch => {
-    dockerIgnoreFileBatch.forEach(dockerIgnoreFile => dockerIgnoreFiles.add(dockerIgnoreFile));
+  dockerIgnoreMatches.forEach((dockerIgnoreFileBatch) => {
+    dockerIgnoreFileBatch.forEach((dockerIgnoreFile) => dockerIgnoreFiles.add(dockerIgnoreFile));
   });
 
   return dockerIgnoreFiles;