Support specifying name of Dockerfile

Author: cristianrgreco

README.md

@@ -90,6 +90,15 @@ const startedContainer = await container
   .start();
 ```
 
+Using a custom Dockerfile name:
+
+```javascript
+const { GenericContainer } = require("testcontainers");
+
+const container = await GenericContainer.fromDockerfile(buildContext, "my-dockerfile")
+  .build();
+```
+
 Creating a container with a specified name:
 
 ```javascript

fixtures/docker-with-custom-filename/Dockerfile-A

@@ -0,0 +1,15 @@
+FROM node:10-alpine
+
+MAINTAINER Cristian Greco
+
+EXPOSE 8080
+
+RUN apk add --no-cache curl dumb-init
+
+RUN npm init -y \
+    && npm install [email protected]
+
+COPY index.js .
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD ["node", "index.js"]

fixtures/docker-with-custom-filename/index.js

@@ -0,0 +1,18 @@
+const express = require("express");
+
+const app = express();
+const port = 8080;
+
+app.get("/hello-world", (req, res) => {
+  res.status(200).send("hello-world");
+});
+
+app.get("/env", (req, res) => {
+  res.status(200).json(process.env);
+});
+
+app.get("/cmd", (req, res) => {
+  res.status(200).json(process.argv);
+});
+
+app.listen(port, () => console.log(`Listening on port ${port}`));

fixtures/docker-with-custom-filename/test.txt

@@ -0,0 +1 @@
+hello world

src/docker-client.ts

@@ -105,7 +105,7 @@ export interface DockerClient {
   removeNetwork(id: string): Promise<void>;
   start(container: Container): Promise<void>;
   exec(container: Container, command: Command[]): Promise<ExecResult>;
-  buildImage(repoTag: RepoTag, context: BuildContext, buildArgs: BuildArgs): Promise<void>;
+  buildImage(repoTag: RepoTag, context: BuildContext, dockerfileName: string, buildArgs: BuildArgs): Promise<void>;
   fetchRepoTags(): Promise<RepoTag[]>;
   getHost(): Host;
 }
@@ -179,11 +179,17 @@ export class DockerodeClient implements DockerClient {
     return { output, exitCode };
   }
 
-  public async buildImage(repoTag: RepoTag, context: BuildContext, buildArgs: BuildArgs): Promise<void> {
+  public async buildImage(
+    repoTag: RepoTag,
+    context: BuildContext,
+    dockerfileName: string,
+    buildArgs: BuildArgs
+  ): 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 stream = await this.dockerode.buildImage(tarStream, {
+      dockerfile: dockerfileName,
       buildargs: buildArgs,
       t: repoTag.toString()
     });

src/generic-container.test.ts

@@ -298,6 +298,17 @@ describe("GenericContainer", () => {
       expect(response.status).toBe(200);
     });
 
+    it("should build and start with custom file name", async () => {
+      const context = path.resolve(__dirname, "..", "fixtures", "docker-with-custom-filename");
+      const container = await GenericContainer.fromDockerfile(context, "Dockerfile-A").build();
+      const startedContainer = managedContainer(await container.withExposedPorts(8080).start());
+
+      const url = `http://${startedContainer.getContainerIpAddress()}:${startedContainer.getMappedPort(8080)}`;
+      const response = await fetch(`${url}/hello-world`);
+
+      expect(response.status).toBe(200);
+    });
+
     it("should set build arguments", async () => {
       const context = path.resolve(__dirname, "..", "fixtures", "docker-with-buildargs");
       const container = await GenericContainer.fromDockerfile(context)

src/generic-container.ts

@@ -42,6 +42,7 @@ export class GenericContainerBuilder {
 
   constructor(
     private readonly context: BuildContext,
+    private readonly dockerfileName: string,
     private readonly uuid: Uuid = new RandomUuid(),
     private readonly dockerClientFactory: DockerClientFactory = new DockerodeClientFactory()
   ) {}
@@ -57,7 +58,7 @@ export class GenericContainerBuilder {
 
     const repoTag = new RepoTag(image, tag);
     const dockerClient = this.dockerClientFactory.getClient();
-    await dockerClient.buildImage(repoTag, this.context, this.buildArgs);
+    await dockerClient.buildImage(repoTag, this.context, this.dockerfileName, this.buildArgs);
     const container = new GenericContainer(image, tag, this.dockerClientFactory);
 
     if (!(await container.isImageCached())) {
@@ -69,8 +70,8 @@ export class GenericContainerBuilder {
 }
 
 export class GenericContainer implements TestContainer {
-  public static fromDockerfile(context: BuildContext): GenericContainerBuilder {
-    return new GenericContainerBuilder(context);
+  public static fromDockerfile(context: BuildContext, dockerfileName: string = "Dockerfile"): GenericContainerBuilder {
+    return new GenericContainerBuilder(context, dockerfileName);
   }
 
   private readonly repoTag: RepoTag;