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:
@@ -36,7 +36,7 @@ import (
|
||||
}
|
||||
|
||||
// Command to execute
|
||||
cmd?: {
|
||||
command?: {
|
||||
// Name of the command to execute
|
||||
// Examples: "ls", "/bin/bash"
|
||||
name: string
|
||||
@@ -61,17 +61,6 @@ import (
|
||||
], 1)
|
||||
}
|
||||
|
||||
// Optionally pass a script to interpret
|
||||
// Example: "echo hello\necho world"
|
||||
script?: string
|
||||
if script != _|_ {
|
||||
// Default interpreter is /bin/sh -c
|
||||
cmd: *{
|
||||
name: "/bin/sh"
|
||||
flags: "-c": script
|
||||
} | {}
|
||||
}
|
||||
|
||||
// Environment variables
|
||||
// Example: {"DEBUG": "1"}
|
||||
env: [string]: string
|
||||
@@ -133,10 +122,10 @@ import (
|
||||
"always": always
|
||||
"mounts": mounts
|
||||
|
||||
if cmd != _|_ {
|
||||
args: [cmd.name] + cmd._flatFlags + cmd.args
|
||||
if command != _|_ {
|
||||
args: [command.name] + command._flatFlags + command.args
|
||||
}
|
||||
if cmd == _|_ {
|
||||
if command == _|_ {
|
||||
args: list.Concat([
|
||||
if _image.config.entrypoint != _|_ {
|
||||
_image.config.entrypoint
|
||||
|
Reference in New Issue
Block a user