kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

added dockerfile: field back to force evaluation of disjunction

Browse Source 
Signed-off-by: Richard Jones <richard@dagger.io>
This commit is contained in:
Richard Jones
2022-01-13 11:57:47 -07:00
parent 2745e1ae2e
commit e59ba48ec0
9 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plan/task/dockerfile.go
View File

@@ -60,7 +60,7 @@ func (t *dockerfileTask) Run(ctx context.Context, pctx *plancontext.Context, s s
dockerfileDef := contextDef
// Support inlined dockerfile
if dockerfile := v.Lookup("contents"); dockerfile.Exists() {
if dockerfile := v.Lookup("dockerfile.contents"); dockerfile.Exists() {
contents, err := dockerfile.String()
if err != nil {
return nil, err
@@ -133,7 +133,7 @@ func (t *dockerfileTask) Run(ctx context.Context, pctx *plancontext.Context, s s
func (t *dockerfileTask) dockerBuildOpts(v *compiler.Value, pctx *plancontext.Context) (map[string]string, error) {
opts := map[string]string{}
if dockerfilePath := v.Lookup("path"); dockerfilePath.Exists() {
if dockerfilePath := v.Lookup("dockerfile.path"); dockerfilePath.Exists() {
filename, err := dockerfilePath.String()
if err != nil {
return nil, err