Merge dagger.io/dagger/engine into dagger.io/dagger

Signed-off-by: Solomon Hykes <solomon@dagger.io>

pkg/universe.dagger.io/docker/test/build.cue

@@ -2,7 +2,6 @@ package docker
 
 import (
 	"dagger.io/dagger"
-	"dagger.io/dagger/engine"
 
 	"universe.dagger.io/alpine"
 	"universe.dagger.io/docker"
@@ -27,7 +26,7 @@ dagger.#Plan & {
 				]
 			}
 
-			verify: engine.#ReadFile & {
+			verify: dagger.#ReadFile & {
 				input: image.output.rootfs
 				path:  "/test.txt"
 			}
@@ -60,7 +59,7 @@ dagger.#Plan & {
 				]
 			}
 
-			verify: engine.#ReadFile & {
+			verify: dagger.#ReadFile & {
 				input: image.output.rootfs
 				path:  "/test.txt"
 			}

pkg/universe.dagger.io/docker/test/image.cue

@@ -2,7 +2,6 @@ package docker
 
 import (
 	"dagger.io/dagger"
-	"dagger.io/dagger/engine"
 	"universe.dagger.io/docker"
 )
 
@@ -13,7 +12,7 @@ dagger.#Plan & {
 		// Test: change image config with docker.#Set
 		set: {
 			image: output: docker.#Image & {
-				rootfs: engine.#Scratch
+				rootfs: dagger.#Scratch
 				config: {
 					cmd: ["/bin/sh"]
 					env: PATH: "/sbin:/bin"
@@ -44,8 +43,8 @@ dagger.#Plan & {
 
 		// Test: image config behavior is correct
 		config: {
-			build: engine.#Dockerfile & {
-				source: engine.#Scratch
+			build: dagger.#Dockerfile & {
+				source: dagger.#Scratch
 				dockerfile: contents: """
 					FROM alpine:3.15.0
 					RUN echo -n 'not hello from dagger' > /dagger.txt

pkg/universe.dagger.io/docker/test/run.cue

@@ -2,7 +2,6 @@ package docker
 
 import (
 	"dagger.io/dagger"
-	"dagger.io/dagger/engine"
 
 	"universe.dagger.io/docker"
 	"universe.dagger.io/alpine"
@@ -25,7 +24,7 @@ dagger.#Plan & {
 				}
 			}
 
-			verify: engine.#ReadFile & {
+			verify: dagger.#ReadFile & {
 				input: run.output.rootfs
 				path:  "/output.txt"
 			}
@@ -61,7 +60,7 @@ dagger.#Plan & {
 				export: directories: "/test": _
 			}
 
-			verify: engine.#ReadFile & {
+			verify: dagger.#ReadFile & {
 				input: run.export.directories."/test".contents
 				path:  "/output.txt"
 			}