added dockerfile: field back to force evaluation of disjunction

Signed-off-by: Richard Jones <richard@dagger.io>

pkg/dagger.io/dagger/engine/image.cue

@@ -75,7 +75,7 @@ package engine
 	// Source directory to build
 	source: #FS
 
-	*{
+	dockerfile: *{
 		path: string | *"Dockerfile"
 	} | {
 		contents: string

plan/task/dockerfile.go

@@ -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

tests/tasks/dockerfile/build_args.cue

@@ -9,7 +9,7 @@ engine.#Plan & {
 
 	actions: build: engine.#Dockerfile & {
 		source: inputs.directories.testdata.contents
-		contents: """
+		dockerfile: contents: """
 			FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
 			ARG TEST=foo
 			RUN test "${TEST}" = "bar"

tests/tasks/dockerfile/dockerfile.cue

@@ -10,6 +10,7 @@ engine.#Plan & {
 	actions: {
 		build: engine.#Dockerfile & {
 			source: inputs.directories.testdata.contents
+			// path:   "Dockerfile"
 		}
 
 		verify: engine.#Exec & {

tests/tasks/dockerfile/dockerfile_path.cue

@@ -10,7 +10,7 @@ engine.#Plan & {
 	actions: {
 		build: engine.#Dockerfile & {
 			source: inputs.directories.testdata.contents
-			path:   "./dockerfilepath/Dockerfile.custom"
+			dockerfile: path: "./dockerfilepath/Dockerfile.custom"
 		}
 
 		verify: engine.#Exec & {

tests/tasks/dockerfile/image_config.cue

@@ -11,7 +11,7 @@ engine.#Plan & {
 		// FIXME: this doesn't test anything beside not crashing
 		build: engine.#Dockerfile & {
 			source: inputs.directories.testdata.contents
-			contents: """
+			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
 				ENV test foobar
 				CMD /test-cmd

tests/tasks/dockerfile/inlined_dockerfile.cue

@@ -10,7 +10,7 @@ engine.#Plan & {
 	actions: {
 		build: engine.#Dockerfile & {
 			source: inputs.directories.testdata.contents
-			contents: """
+			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
 				RUN echo foobar > /output
 				"""

tests/tasks/dockerfile/labels.cue

@@ -11,7 +11,7 @@ engine.#Plan & {
 		// FIXME: this doesn't test anything beside not crashing
 		build: engine.#Dockerfile & {
 			source: inputs.directories.testdata.contents
-			contents: """
+			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
 				"""
 			label: FOO: "bar"

tests/tasks/dockerfile/platform.cue

@@ -11,7 +11,7 @@ engine.#Plan & {
 		// FIXME: this doesn't test anything beside not crashing
 		build: engine.#Dockerfile & {
 			source: inputs.directories.testdata.contents
-			contents: """
+			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
 				"""
 			platforms: ["linux/amd64"]