fix(container): extraFlags weren't used when building in-cluster

garden-io · Jun 15, 2020 · 1bbaad6 · 1bbaad6
1 parent ebb42e2
commit 1bbaad6
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/garden-service/src/plugins/container/build.ts b/garden-service/src/plugins/container/build.ts
@@ -59,8 +59,6 @@ export async function buildContainerModule({ module, log }: BuildModuleParams<Co
 
   const cmdOpts = ["build", "-t", identifier, ...getDockerBuildFlags(module)]
 
-  cmdOpts.push(...(module.spec.extraFlags || []))
-
   if (module.spec.dockerfile) {
     cmdOpts.push("--file", containerHelpers.getDockerfileBuildPath(module))
   }
@@ -94,5 +92,7 @@ export function getDockerBuildFlags(module: ContainerModule) {
     args.push("--target", module.spec.build.targetImage)
   }
 
+  args.push(...(module.spec.extraFlags || []))
+
   return args
 }
diff --git a/garden-service/test/unit/src/plugins/container/container.ts b/garden-service/test/unit/src/plugins/container/container.ts
@@ -28,6 +28,7 @@ import {
   minDockerVersion,
   DEFAULT_BUILD_TIMEOUT,
 } from "../../../../../src/plugins/container/helpers"
+import { getDockerBuildFlags } from "../../../../../src/plugins/container/build"
 
 describe("plugins.container", () => {
   const projectRoot = resolve(dataDir, "test-project-container")
@@ -988,4 +989,41 @@ describe("plugins.container", () => {
       )
     })
   })
+
+  describe("getDockerBuildFlags", () => {
+    it("should include extraFlags", async () => {
+      const module = await getTestModule({
+        allowPublish: false,
+        build: {
+          dependencies: [],
+        },
+        disabled: false,
+        apiVersion: "garden.io/v0",
+        name: "module-a",
+        outputs: {},
+        path: modulePath,
+        type: "container",
+
+        spec: {
+          build: {
+            dependencies: [],
+            timeout: DEFAULT_BUILD_TIMEOUT,
+          },
+          buildArgs: {},
+          extraFlags: ["--cache-from", "some-image:latest"],
+          services: [],
+          tasks: [],
+          tests: [],
+        },
+
+        serviceConfigs: [],
+        taskConfigs: [],
+        testConfigs: [],
+      })
+
+      const args = getDockerBuildFlags(module)
+
+      expect(args).to.eql(["--cache-from", "some-image:latest"])
+    })
+  })
 })