Europa: cleanup docker.#Build

Signed-off-by: Solomon Hykes <solomon@dagger.io>
This commit is contained in:
Solomon Hykes
2022-01-07 05:04:59 +00:00
committed by Solomon Hykes
parent 458d04819d
commit 25d1656329
2 changed files with 57 additions and 108 deletions

View File

@@ -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
//// // 1. image -> input
//// 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
"\(idx)": step & {
// connect input to previous output
if idx > 0 {
input: dag["\(idx-1)"].output
}
}
}
}