Simplify docker.#Run

* `cmd` is renamed to `command` for readability
  * `script` is removed. Feature moves up the stack (bash.#Run,
    python.#Run)

Signed-off-by: Solomon Hykes <solomon@dagger.io>
This commit is contained in:
Solomon Hykes
2022-02-08 01:35:51 +00:00
parent c04d0cdd0b
commit 354334a3dc
18 changed files with 129 additions and 81 deletions

View File

@@ -8,17 +8,22 @@ import (
)
// Run a python script in a container
#Run: docker.#Run & {
#Run: {
// Contents of the python script
script: string
cmd: {
name: "python"
flags: "-c": script
}
// As a convenience, image defaults to a ready-to-use python environment
image: docker.#Image | *_defaultImage
// FIXME: don't pass the script as argument: write to filesystme instead
docker.#Run & {
command: {
name: "python"
flags: "-c": script
}
_defaultImage: alpine.#Image & {
packages: python: version: "3"
// As a convenience, image defaults to a ready-to-use python environment
image: docker.#Image | *_defaultImage
_defaultImage: alpine.#Image & {
packages: python: version: "3"
}
}
}