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

Simplify docker.#Run

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

2
pkg/universe.dagger.io/alpine/alpine.cue
View File

@ -27,7 +27,7 @@ import (
},
for pkgName, pkg in packages {
docker.#Run & {
cmd: {
command: {
name: "apk"
args: ["add", "\(pkgName)\(pkg.version)"]
flags: {

5
pkg/universe.dagger.io/alpine/test/package-install.cue
View File

@ -17,10 +17,13 @@ dagger.#Plan & {
check: docker.#Run & {
image: build.output
script: """
command: {
name: "sh"
flags: "-c": """
jq --version > /jq-version.txt
curl --version > /curl-version.txt
"""
}
export: files: {
"/jq-version.txt": contents: =~"^jq"

9
pkg/universe.dagger.io/bash/bash.cue
View File

@ -6,9 +6,13 @@ import (
)
// Run a bash command or script in a container
#Run: docker.#Run & {
#Run: {
// Contents of the bash script
script: string
cmd: {
// FIXME: don't pass the script as argument: write to filesystme instead
docker.#Run & {
command: {
name: "bash"
flags: {
"-c": script
@ -18,4 +22,5 @@ import (
"-o": "pipefail"
}
}
}
}

19
pkg/universe.dagger.io/docker/run.cue
View File

@ -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

15
pkg/universe.dagger.io/docker/test/build-multi-steps.cue
View File

@ -16,19 +16,28 @@ dagger.#Plan & {
steps: [
alpine.#Build,
docker.#Run & {
script: """
command: {
name: "sh"
flags: "-c": """
echo -n hello > /bar.txt
"""
}
},
docker.#Run & {
script: """
command: {
name: "sh"
flags: "-c": """
echo -n $(cat /bar.txt) world > /foo.txt
"""
}
},
docker.#Run & {
script: """
command: {
name: "sh"
flags: "-c": """
echo -n $(cat /foo.txt) >> /test.txt
"""
}
},
]
}

7
pkg/universe.dagger.io/docker/test/build-simple.cue
View File

@ -17,9 +17,10 @@ dagger.#Plan & {
steps: [
alpine.#Build,
docker.#Run & {
script: """
echo -n $TEST >> /test.txt
"""
command: {
name: "sh"
flags: "-c": "echo -n $TEST >> /test.txt"
}
env: TEST: #testValue
},
]

12
pkg/universe.dagger.io/docker/test/image-config-test.cue
View File

@ -27,7 +27,7 @@ dagger.#Plan & {
}
run: docker.#Run & {
image: myimage
cmd: name: "ls"
command: name: "ls"
export: files: {
"/dagger.txt": _ & {
contents: "not hello from dagger"
@ -57,9 +57,12 @@ dagger.#Plan & {
verify_working_directory: docker.#Run & {
image: myimage
script: #"""
command: {
name: "sh"
flags: "-c": #"""
pwd > dir.txt
"""#
}
export: files: "/bin/dir.txt": _ & {
contents: "/bin\n"
}
@ -67,9 +70,12 @@ dagger.#Plan & {
verify_working_directory_is_overridden: docker.#Run & {
image: myimage
workdir: "/"
script: #"""
command: {
name: "sh"
flags: "-c": #"""
pwd > dir.txt
"""#
}
export: files: "/dir.txt": _ & {
contents: "/\n"
}

7
pkg/universe.dagger.io/docker/test/multi-nested-build-test.cue
View File

@ -5,6 +5,7 @@ import (
"universe.dagger.io/docker"
)
// FIXME: this test is currently broken (see docker.bats)
dagger.#Plan & {
actions: build: docker.#Build & {
steps: [
@ -16,17 +17,17 @@ dagger.#Plan & {
source: "alpine"
},
docker.#Run & {
cmd: name: "ls"
command: name: "ls"
},
]
},
docker.#Run & {
cmd: name: "ls"
command: name: "ls"
},
]
},
docker.#Run & {
cmd: name: "ls"
command: name: "ls"
},
]
}

4
pkg/universe.dagger.io/docker/test/nested-build-test.cue
View File

@ -14,12 +14,12 @@ dagger.#Plan & {
source: "alpine"
},
docker.#Run & {
cmd: name: "ls"
command: name: "ls"
},
]
},
docker.#Run & {
cmd: name: "ls"
command: name: "ls"
},
]
}

2
pkg/universe.dagger.io/docker/test/run-command-test.cue
View File

@ -13,7 +13,7 @@ dagger.#Plan & {
run: docker.#Run & {
"image": image.output
cmd: {
command: {
name: "/bin/sh"
args: ["-c", "echo -n hello world >> /output.txt"]
}

5
pkg/universe.dagger.io/docker/test/run-export-directory-test.cue
View File

@ -13,10 +13,13 @@ dagger.#Plan & {
run: docker.#Run & {
"image": image.output
script: #"""
command: {
name: "sh"
flags: "-c": #"""
mkdir -p test
echo -n hello world >> /test/output.txt
"""#
}
export: {
directories: "/test": _
files: "/test/output.txt": _ & {

5
pkg/universe.dagger.io/docker/test/run-export-file-test.cue
View File

@ -12,9 +12,12 @@ dagger.#Plan & {
run: docker.#Run & {
"image": image.output
script: #"""
command: {
name: "sh"
flags: "-c": #"""
echo -n hello world >> /output.txt
"""#
}
export: files: "/output.txt": _ & {
contents: "hello world"
}

5
pkg/universe.dagger.io/docker/test/run-script-test.cue
View File

@ -13,9 +13,12 @@ dagger.#Plan & {
run: docker.#Run & {
"image": image.output
script: #"""
command: {
name: "sh"
flags: "-c": #"""
echo -n $TEST_MESSAGE >> /output.txt
"""#
}
env: TEST_MESSAGE: "hello world"
}

17
pkg/universe.dagger.io/examples/changelog.com/highlevel/ci.cue
View File

@ -38,7 +38,10 @@ dagger.#Plan & {
dev.assets,
// 2. Mix magical command
mix.#Run & {
script: "mix phx.digest"
command: {
name: "mix"
args: ["phx.digest"]
}
mix: {
env: "prod"
app: _appName
@ -94,7 +97,12 @@ dagger.#Plan & {
}
// FIXME: run 'yarn install' and 'yarn run compile' separately, with different caching?
// FIXME: can we reuse universe.dagger.io/yarn ???? 0:-)
script: "yarn install --frozen-lockfile && yarn run compile"
command: {
name: "sh"
flags: "-c": """
yarn install --frozen-lockfile && yarn run compile"
"""
}
workdir: "/app/assets"
},
]
@ -111,7 +119,10 @@ dagger.#Plan & {
// Run tests
run: docker.#Run & {
image: build.output
script: "mix test"
command: {
name: "mix"
args: ["test"]
}
// Don't cache running tests
// Just because we've tested a version before, doesn't mean we don't
// want to test it again.

10
pkg/universe.dagger.io/examples/changelog.com/highlevel/elixir/mix/mix.cue
View File

@ -42,7 +42,10 @@ import (
depsCache: "locked"
}
workdir: "/app"
script: "mix deps.get"
command: {
name: "mix"
args: ["deps.get"]
}
},
// 4. Build!
// FIXME: step 5 is to add image data, see issue 1339
@ -54,7 +57,10 @@ import (
buildCache: "locked"
}
workdir: "/app"
script: "mix do deps.compile, compile"
command: {
name: "mix"
args: ["do", "deps.compile,compile"]
}
},
]
}

9
pkg/universe.dagger.io/netlify/netlify.cue
View File

@ -51,7 +51,7 @@ import (
}
},
docker.#Run & {
cmd: {
command: {
name: "yarn"
args: ["global", "add", "netlify-cli@8.6.21"]
}
@ -76,7 +76,10 @@ import (
// yarn: version: "=~1.22"
// }
// steps: [{
// run: script: "yarn global add netlify-cli@3.38.10"
// run: command: {
// name: "sh"
// flags: "-c": "yarn global add netlify-cli@3.38.10"
// }
// }]
// }
@ -111,7 +114,7 @@ import (
contents: token
}
}
cmd: name: "/app/deploy.sh"
command: name: "/app/deploy.sh"
export: files: {
"/netlify/url": _

9
pkg/universe.dagger.io/python/python.cue
View File

@ -8,9 +8,13 @@ import (
)
// Run a python script in a container
#Run: docker.#Run & {
#Run: {
// Contents of the python script
script: string
cmd: {
// FIXME: don't pass the script as argument: write to filesystme instead
docker.#Run & {
command: {
name: "python"
flags: "-c": script
}
@ -21,4 +25,5 @@ import (
_defaultImage: alpine.#Image & {
packages: python: version: "3"
}
}
}