kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Europa: cleanup docker.#Build

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
europa-universe/docker/build.cue
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
"\(idx)": step & {
// connect input to previous output
if idx > 0 {
"\(idx)": input: dag["\(idx-1)"].output
input: dag["\(idx-1)"].output
}
}
}
}

43
europa-universe/docker/test/build/build.cue
View File

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