Europa: cleanup docker.#Build

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

europa-universe/docker/build.cue

@@ -13,45 +13,11 @@ import (
 	// Generate build DAG from linerar steps
 	dag: {
 		for idx, step in steps {
-			///// FIXME: this section is broken and in the middle of debug + rewrite
+			"\(idx)": step & {
-			//// // 1. image -> input
+				// connect input to previous output
-			//// if (step.input == _|_) && ((step.image & #Image) != _|_) {
-			////  input: image
-			//// }
-
-			//// // 2. 
-			//// if ((step.output & docker.#Image) == _|_) && ((step.output.rootfs & dagger.#FS) != _|_) {
-			////  
-			//// }
-
-			//// // As a special case, wrap #Run into a valid step
-			//// if step.run != _|_ {
-			////  "\(idx)": {
-			////   input: _
-			////   run:   step & {
-			////    image: input
-			////    output: rootfs: _
-			////   }
-			////   output: {
-			////    config: input.config
-			////    rootfs: run.output.rootfs
-			////   }
-			////  }
-			//// }
-
-			//// // Otherwise, just use the step as is
-			//// if step.run == _|_ {
-			////  "\(idx)": {
-			////   run: false
-			////   step
-			////  }
-			//// }
-
-			"\(idx)": step
-
-			// Either way, connect input to previous output
 				if idx > 0 {
-				"\(idx)": input: dag["\(idx-1)"].output
+					input: dag["\(idx-1)"].output
+				}
 			}
 		}
 	}

europa-universe/docker/test/build/build.cue

@@ -5,27 +5,18 @@ import (
 	"universe.dagger.io/nginx"
 )
 
-build0: #Build & {
+tests: {
-	steps: [
+	"set config manually": build: #Build & {
-		{
+		steps: [{
 			output: #Image & {
 				config: user: "foo"
 			}
-		},
+		}]
-	]
+	}
-}
 
-// Inventory of real-world build use cases
+	//    - import nginx base
-//
+	//    - copy app directory into /usr/share/nginx/html
-// 1. Build netlify image
+	"build static web server": {
-//    - import alpine base
-//    - execute 'yarn add netlify'
-
-// 2. Build todoapp dev image
-//    - import nginx base
-//    - copy app directory into /usr/share/nginx/html
-
-build2: {
 		source: dagger.#FS
 
 		build: #Build & {
@@ -46,21 +37,13 @@ build2: {
 				},
 			]
 		}
-	img: build.output
 
+		image: build.output
 		// Assert:
-	img: config: user: "42"
+		image: config: user: "42"
-}
+	}
 
-// 3. Build alpine base image
+	"Run multiple commands": {
-//    - pull from docker hub
-//    - execute 'apk add' once per package
-
-// 4. Build app from dockerfile
-
-// 5. execute several commands in a row
-
-build3: {
 		build: #Build & {
 			steps: [
 				#Pull & {
@@ -77,6 +60,6 @@ build3: {
 				},
 			]
 		}
-
 		result: build.output
+	}
 }