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

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

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

@@ -2,7 +2,6 @@ package docker
 
 import (
 	"dagger.io/dagger"
-	"dagger.io/dagger/engine"
 )
 
 // A container image
@@ -11,7 +10,7 @@ import (
 	rootfs: dagger.#FS
 
 	// Image config
-	config: engine.#ImageConfig
+	config: dagger.#ImageConfig
 }
 
 // A ref is an address for a remote container image
@@ -21,4 +20,4 @@ import (
 //   - "index.docker.io/dagger:latest"
 //   - "index.docker.io/dagger:latest@sha256:a89cb097693dd354de598d279c304a1c73ee550fbfff6d9ee515568e0c749cfe"
 // FIXME: add formatting constraints
-#Ref: engine.#Ref
+#Ref: dagger.#Ref