Merge pull request #630 from carolynvs/import-oops

Do not import pkg/config from pkg/mixins
getporter · Sep 18, 2019 · f1f5217 · f1f5217
2 parents 21bb79f + 7389c40
commit f1f5217
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/pkg/build/dockerfile-generater.go b/pkg/build/dockerfile-generater.go
@@ -165,7 +165,7 @@ func (g *DockerfileGenerator) buildMixinsSection() ([]string, error) {
 
 func (g *DockerfileGenerator) getMixinBuildInput(m string) mixin.BuildInput {
 	input := mixin.BuildInput{
-		Actions: make(map[string]config.Steps, 3),
+		Actions: make(map[string]interface{}, 3),
 	}
 
 	for _, mixinDecl := range g.Manifest.Mixins {

diff --git a/pkg/mixin/buildInput.go b/pkg/mixin/buildInput.go
@@ -1,10 +1,6 @@
 package mixin
 
-import (
-	"github.com/deislabs/porter/pkg/config"
-)
-
 type BuildInput struct {
-	Config  interface{}             `yaml:"config,omitempty"`
-	Actions map[string]config.Steps `yaml:"actions"`
+	Config  interface{}            `yaml:"config,omitempty"`
+	Actions map[string]interface{} `yaml:"actions"`
 }