Skip to content

Commit f1f5217

Browse files
Merge pull request #630 from carolynvs/import-oops
Do not import pkg/config from pkg/mixins
2 parents 21bb79f + 7389c40 commit f1f5217

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

pkg/build/dockerfile-generater.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func (g *DockerfileGenerator) buildMixinsSection() ([]string, error) {
165165

166166
func (g *DockerfileGenerator) getMixinBuildInput(m string) mixin.BuildInput {
167167
input := mixin.BuildInput{
168-
Actions: make(map[string]config.Steps, 3),
168+
Actions: make(map[string]interface{}, 3),
169169
}
170170

171171
for _, mixinDecl := range g.Manifest.Mixins {

pkg/mixin/buildInput.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package mixin
22

3-
import (
4-
"github.com/deislabs/porter/pkg/config"
5-
)
6-
73
type BuildInput struct {
8-
Config interface{} `yaml:"config,omitempty"`
9-
Actions map[string]config.Steps `yaml:"actions"`
4+
Config interface{} `yaml:"config,omitempty"`
5+
Actions map[string]interface{} `yaml:"actions"`
106
}

0 commit comments

Comments
 (0)