Skip to content

fix: stacker convert should include ENV vars into the runtime config. #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmblatten wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: stacker convert should include ENV vars into the runtime config. #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions pkg/stacker/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,14 @@ func (c *Converter) convertCommand(cmd *Command) error {
c.env = map[string]string{}
}

// Dockerfile ENV defines build and runtime variables.
// For equivalent in stacker, also add them to layer's
// Environment(runtime).
//
if layer.Environment == nil {
layer.Environment = map[string]string{}
}

// parser returns key, value, sep for ENV since v0.16.1
// https://github.com/moby/buildkit/commit/6cfa4599029db7f2e6e83feaaa33984785ddd147
if len(cmd.Value) < 3 {
Expand Down Expand Up @@ -207,11 +215,8 @@ func (c *Converter) convertCommand(cmd *Command) error {
}
}

if c.env == nil {
c.env = map[string]string{}
}

c.env[key] = val
layer.Environment[key] = val
}
case "workdir":
layer.Run = append(layer.Run, fmt.Sprintf("mkdir -p %s", cmd.Value[0]))
Expand Down
9 changes: 7 additions & 2 deletions pkg/stacker/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,13 @@ func TestConverterConvertCommandErrors(t *testing.T) {
},
{
name: "invalid env",
c: NewConverter(&ConvertArgs{}),
cmd: &Command{Cmd: "env", Original: "ENV FOO", Value: []string{"FOO"}},
c: func() *Converter {
c := NewConverter(&ConvertArgs{})
c.currLayer = "layer"
c.output[c.currLayer] = &types.Layer{}
return c
}(),
cmd: &Command{Cmd: "env", Original: "ENV FOO", Value: []string{"FOO"}},
},
{
name: "invalid arg",
Expand Down