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

bash.#Run: new and improved

Browse Source 
* Script is written to filesystem, not inlined as argument
* Pass script either as string, or directory+filename

Signed-off-by: Solomon Hykes <solomon@dagger.io>
This commit is contained in:
Solomon Hykes
2022-02-08 17:54:42 +00:00
parent 4944bead44
commit 013900c2a2
8 changed files with 171 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/universe.dagger.io/yarn/test/yarn-test.cue
View File

@@ -33,7 +33,7 @@ dagger.#Plan & {
dest: "/build"
contents: pkg.output
}
script: #"""
script: contents: #"""
test "$(cat /build/test)" = "output"
"""#
}

29
pkg/universe.dagger.io/yarn/yarn.cue
View File

@@ -48,33 +48,19 @@ import (
// yarnVersion: *"=~1.22" | string
// FIXME: custom base image not supported
image: alpine.#Build & {
_buildImage: alpine.#Build & {
packages: {
bash: {}
yarn: {}
}
}
// Run yarn in a containerized build environment
command: bash.#Run & {
// FIXME: not working?
// *{
// _image: alpine.#Build & {
// packages: {
// bash: version: "=~5.1"
// yarn: version: yarnVersion
// }
// }
// Run yarn in a docker container
container: bash.#Run & {
image: _buildImage.output
// image: _image.output
// env: CUSTOM_IMAGE: "0"
// } | {
// env: CUSTOM_IMAGE: "1"
// }
"image": image.output
script: #"""
// FIXME: move shell script to its own file
script: contents: #"""
# Create $ENVFILE_NAME file if set
[ -n "$ENVFILE_NAME" ] && echo "$ENVFILE" > "$ENVFILE_NAME"
@@ -94,7 +80,6 @@ import (
dest: "/src"
contents: source
}
// FIXME: mount secrets
}
export: directories: "/build": _
@@ -115,5 +100,5 @@ import (
}
// The final contents of the package after build
output: command.export.directories."/build".contents
output: container.export.directories."/build".contents
}