fix(openfaas): builder now works on all platforms

And considerably more elegant too!
garden-io · Oct 28, 2018 · 529f63c · 529f63c
1 parent 641a07c
commit 529f63c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/garden-service/src/plugins/openfaas/openfaas.ts b/garden-service/src/plugins/openfaas/openfaas.ts
@@ -107,7 +107,7 @@ export function gardenPlugin({ config }: { config: OpenFaasConfig }): GardenPlug
   config = validate(config, configSchema, { context: "OpenFaaS provider config" })
 
   return {
-    modules: [join(STATIC_DIR, "openfaas", "builder")],
+    modules: [join(STATIC_DIR, "openfaas", "templates")],
     actions: {
       async getEnvironmentStatus({ ctx }: GetEnvironmentStatusParams) {
         const ofGarden = await getOpenFaasGarden(ctx)
@@ -155,10 +155,10 @@ export function gardenPlugin({ config }: { config: OpenFaasConfig }): GardenPlug
           )
 
           moduleConfig.build.dependencies.push({
-            name: "builder",
+            name: "templates",
             plugin: "openfaas",
             copy: [{
-              source: "templates/template",
+              source: "template",
               target: ".",
             }],
           })
@@ -187,7 +187,6 @@ export function gardenPlugin({ config }: { config: OpenFaasConfig }): GardenPlug
         getBuildStatus: getGenericModuleBuildStatus,
 
         async build({ ctx, module }: BuildModuleParams<OpenFaasModule>) {
-          // prepare the stack.yml file, before handing off the build to the generic handler
           await writeStackFile(ctx, module, {})
 
           const buildLog = await faasCli.stdout({

diff --git a/garden-service/static/openfaas/builder/Dockerfile b/garden-service/static/openfaas/builder/Dockerfile
diff --git a/garden-service/static/openfaas/builder/garden.yml b/garden-service/static/openfaas/builder/garden.yml
diff --git a/garden-service/static/openfaas/templates/garden.yml b/garden-service/static/openfaas/templates/garden.yml
@@ -0,0 +1,5 @@
+module:
+  description: OpenFaaS templates for building functions
+  name: templates
+  type: generic
+  repositoryUrl: https://github.com/openfaas/templates.git#master