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

stdlib: rename dagger.io/llb to dagger.io/dagger/op

Browse Source 
Signed-off-by: Solomon Hykes <sh.github.6811@hykes.org>
This commit is contained in:
Solomon Hykes 2021-04-06 00:27:51 +00:00
parent 7fb90790f3
commit 6673ae69b3
26 changed files with 143 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker.cue
View File

@ -2,14 +2,14 @@ package main
import ( import (
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/llb" "dagger.io/dagger/op"
) )
#ImageFromSource: { #ImageFromSource: {
source: dagger.#Artifact source: dagger.#Artifact
#up: [ #up: [
llb.#DockerBuild & { op.#DockerBuild & {
context: source context: source
}, },
] ]
@ -19,7 +19,7 @@ import (
ref: string ref: string
#up: [ #up: [
llb.#FetchContainer & { op.#FetchContainer & {
"ref": ref "ref": ref
}, },
] ]
@ -30,7 +30,7 @@ import (
context: dagger.#Artifact context: dagger.#Artifact
#up: [ #up: [
llb.#DockerBuild & { op.#DockerBuild & {
"context": context "context": context
"dockerfile": dockerfile "dockerfile": dockerfile
}, },
@ -74,10 +74,10 @@ import (
// Execute each command in a pristine filesystem state // Execute each command in a pristine filesystem state
// (commands do not interfere with each other's changes) // (commands do not interfere with each other's changes)
#up: [ #up: [
llb.#Load & {from: image}, op.#Load & {from: image},
// Copy volumes with type=copy // Copy volumes with type=copy
for _, v in volume if v.type == "copy" { for _, v in volume if v.type == "copy" {
llb.#Copy & { op.#Copy & {
from: v.from from: v.from
dest: v.dest dest: v.dest
src: v.source src: v.source
@ -85,12 +85,12 @@ import (
}, },
// Execute setup script // Execute setup script
if setup != null { if setup != null {
llb.#Exec & { op.#Exec & {
"env": env "env": env
args: ["/bin/sh", "-c", setup] args: ["/bin/sh", "-c", setup]
} }
}, },
llb.#Exec & { op.#Exec & {
"args": args "args": args
"env": env "env": env
"dir": dir "dir": dir
@ -110,7 +110,7 @@ import (
} }
} }
}, },
llb.#Subdir & { op.#Subdir & {
dir: outputDir dir: outputDir
}, },
] ]

8
stdlib/alpine/alpine.cue
View File

@ -1,7 +1,7 @@
package alpine package alpine
import ( import (
"dagger.io/llb" "dagger.io/dagger/op"
) )
let defaultVersion = "3.13.2@sha256:a75afd8b57e7f34e4dad8d65e2c7ba2e1975c795ce1ee22fa34f8cf46f96a3be" let defaultVersion = "3.13.2@sha256:a75afd8b57e7f34e4dad8d65e2c7ba2e1975c795ce1ee22fa34f8cf46f96a3be"
@ -11,17 +11,17 @@ let defaultVersion = "3.13.2@sha256:a75afd8b57e7f34e4dad8d65e2c7ba2e1975c795ce1e
version: string | *defaultVersion version: string | *defaultVersion
#up: [ #up: [
llb.#FetchContainer & { op.#FetchContainer & {
ref: "index.docker.io/alpine:\(version)" ref: "index.docker.io/alpine:\(version)"
}, },
for pkg, info in package { for pkg, info in package {
if (info & true) != _|_ { if (info & true) != _|_ {
llb.#Exec & { op.#Exec & {
args: ["apk", "add", "-U", "--no-cache", pkg] args: ["apk", "add", "-U", "--no-cache", pkg]
} }
} }
if (info & string) != _|_ { if (info & string) != _|_ {
llb.#Exec & { op.#Exec & {
args: ["apk", "add", "-U", "--no-cache", "\(pkg)\(info)"] args: ["apk", "add", "-U", "--no-cache", "\(pkg)\(info)"]
} }
} }

4
stdlib/aws/aws.cue
View File

@ -2,7 +2,7 @@ package aws
import ( import (
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/llb" "dagger.io/dagger/op"
"dagger.io/alpine" "dagger.io/alpine"
) )
@ -19,7 +19,7 @@ import (
// Re-usable aws-cli component // Re-usable aws-cli component
#CLI: { #CLI: {
#up: [ #up: [
llb.#Load & { op.#Load & {
from: alpine.#Image & { from: alpine.#Image & {
package: bash: "=5.1.0-r0" package: bash: "=5.1.0-r0"
package: jq: "=1.6-r1" package: jq: "=1.6-r1"

12
stdlib/aws/cloudformation/cloudformation.cue
View File

@ -3,7 +3,7 @@ package cloudformation
import ( import (
"encoding/json" "encoding/json"
"dagger.io/llb" "dagger.io/dagger/op"
"dagger.io/aws" "dagger.io/aws"
) )
@ -47,19 +47,19 @@ import (
outputs: [string]: string outputs: [string]: string
outputs: #up: [ outputs: #up: [
llb.#Load & { op.#Load & {
from: aws.#CLI from: aws.#CLI
}, },
llb.#Mkdir & { op.#Mkdir & {
path: "/src" path: "/src"
}, },
for dest, content in #files { for dest, content in #files {
llb.#WriteFile & { op.#WriteFile & {
"dest": dest "dest": dest
"content": content "content": content
} }
}, },
llb.#Exec & { op.#Exec & {
args: [ args: [
"/bin/bash", "/bin/bash",
"--noprofile", "--noprofile",
@ -86,7 +86,7 @@ import (
dir: "/src" dir: "/src"
mount: "/cache/aws": "cache" mount: "/cache/aws": "cache"
}, },
llb.#Export & { op.#Export & {
source: "/outputs.json" source: "/outputs.json"
format: "json" format: "json"
}, },

10
stdlib/aws/eks/eks.cue
View File

@ -2,7 +2,7 @@ package eks
import ( import (
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/llb" "dagger.io/dagger/op"
"dagger.io/aws" "dagger.io/aws"
) )
@ -22,14 +22,14 @@ import (
dagger.#Secret dagger.#Secret
#up: [ #up: [
llb.#Load & { op.#Load & {
from: aws.#CLI from: aws.#CLI
}, },
llb.#WriteFile & { op.#WriteFile & {
dest: "/entrypoint.sh" dest: "/entrypoint.sh"
content: #Code content: #Code
}, },
llb.#Exec & { op.#Exec & {
always: true always: true
args: [ args: [
"/bin/bash", "/bin/bash",
@ -55,7 +55,7 @@ import (
"/cache/bin": "cache" "/cache/bin": "cache"
} }
}, },
llb.#Export & { op.#Export & {
source: "/kubeconfig" source: "/kubeconfig"
format: "string" format: "string"
}, },

4
stdlib/dagger/dagger.cue
View File

@ -1,13 +1,13 @@
package dagger package dagger
import ( import (
"dagger.io/llb" "dagger.io/dagger/op"
) )
// An artifact such as source code checkout, container image, binary archive... // An artifact such as source code checkout, container image, binary archive...
// May be passed as user input, or computed by a buildkit pipeline // May be passed as user input, or computed by a buildkit pipeline
#Artifact: { #Artifact: {
#up: [...llb.#Op] #up: [...op.#Op]
_ _
... ...
} }

4
stdlib/llb/llb.cue → stdlib/dagger/op/op.cue
View File

@ -1,5 +1,5 @@
// llb: compile LLB graphs executable by buildkit // op: low-level operations for Dagger processing pipelines
package llb package op
// One operation in a pipeline // One operation in a pipeline
#Op: #Export | #Op: #Export |

12
stdlib/docker/docker.cue
View File

@ -2,7 +2,7 @@ package docker
import ( import (
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/llb" "dagger.io/dagger/op"
) )
#Ref: string #Ref: string
@ -12,7 +12,7 @@ import (
source: dagger.#Artifact source: dagger.#Artifact
image: #up: [ image: #up: [
llb.#DockerBuild & {context: source}, op.#DockerBuild & {context: source},
] ]
} }
@ -23,15 +23,15 @@ import (
{ {
image: #Ref image: #Ref
out: #up: [ out: #up: [
llb.#FetchContainer & {ref: image}, op.#FetchContainer & {ref: image},
llb.#Exec & {"args": args}, op.#Exec & {"args": args},
] ]
} | { } | {
image: _ image: _
out: #up: [ out: #up: [
llb.#Load & {from: image}, op.#Load & {from: image},
llb.#Exec & {"args": args}, op.#Exec & {"args": args},
] ]
} }
} }

16
stdlib/file/file.cue
View File

@ -3,7 +3,7 @@ package file
import ( import (
"strings" "strings"
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/llb" "dagger.io/dagger/op"
) )
#Create: { #Create: {
@ -12,7 +12,7 @@ import (
contents: string | bytes contents: string | bytes
#up: [ #up: [
llb.#WriteFile & {dest: filename, content: contents, mode: permissions}, op.#WriteFile & {dest: filename, content: contents, mode: permissions},
] ]
} }
@ -25,7 +25,7 @@ import (
orig: (#read & {path: filename, "from": from}).data orig: (#read & {path: filename, "from": from}).data
#up: [ #up: [
llb.#WriteFile & {dest: filename, content: "\(orig)\(contents)", mode: permissions}, op.#WriteFile & {dest: filename, content: "\(orig)\(contents)", mode: permissions},
] ]
} }
@ -41,8 +41,8 @@ import (
data: { data: {
string string
#up: [ #up: [
llb.#Load & {"from": from}, op.#Load & {"from": from},
llb.#Export & {source: path}, op.#Export & {source: path},
] ]
} }
} }
@ -63,11 +63,11 @@ _#glob: {
string string
_tmppath: "/tmp/ls.out" _tmppath: "/tmp/ls.out"
#up: [ #up: [
llb.#Load & {"from": from}, op.#Load & {"from": from},
llb.#Exec & { op.#Exec & {
args: ["sh", "-c", "ls \(glob) > \(_tmppath)"] args: ["sh", "-c", "ls \(glob) > \(_tmppath)"]
}, },
llb.#Export & {source: _tmppath}, op.#Export & {source: _tmppath},
] ]
} }
} }

4
stdlib/git/git.cue
View File

@ -1,7 +1,7 @@
package git package git
import ( import (
"dagger.io/llb" "dagger.io/dagger/op"
) )
// A git repository // A git repository
@ -11,7 +11,7 @@ import (
ref: string ref: string
#up: [ #up: [
llb.#FetchGit & { op.#FetchGit & {
"remote": remote "remote": remote
"ref": ref "ref": ref
}, },

8
stdlib/go/go.cue
View File

@ -2,7 +2,7 @@ package go
import ( import (
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/llb" "dagger.io/dagger/op"
) )
#Go: { #Go: {
@ -19,10 +19,10 @@ import (
env: [string]: string env: [string]: string
#up: [ #up: [
llb.#FetchContainer & { op.#FetchContainer & {
ref: "docker.io/golang:\(version)-alpine" ref: "docker.io/golang:\(version)-alpine"
}, },
llb.#Exec & { op.#Exec & {
"args": ["go"] + args "args": ["go"] + args
"env": env "env": env
@ -65,7 +65,7 @@ import (
env: [string]: string env: [string]: string
#up: [ #up: [
llb.#Copy & { op.#Copy & {
from: #Go & { from: #Go & {
"version": version "version": version
"source": source "source": source

16
stdlib/kubernetes/helm/helm.cue
View File

@ -4,7 +4,7 @@ import (
"strconv" "strconv"
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/llb" "dagger.io/dagger/op"
"dagger.io/kubernetes" "dagger.io/kubernetes"
) )
@ -51,12 +51,12 @@ import (
kubectlVersion: *"v1.19.9" | string kubectlVersion: *"v1.19.9" | string
#up: [ #up: [
llb.#Load & { op.#Load & {
from: kubernetes.#Kubectl & { from: kubernetes.#Kubectl & {
version: kubectlVersion version: kubectlVersion
} }
}, },
llb.#Exec & { op.#Exec & {
env: HELM_VERSION: version env: HELM_VERSION: version
args: [ args: [
"/bin/bash", "/bin/bash",
@ -74,25 +74,25 @@ import (
"""#, """#,
] ]
}, },
llb.#Mkdir & { op.#Mkdir & {
path: "/helm" path: "/helm"
}, },
llb.#WriteFile & { op.#WriteFile & {
dest: "/entrypoint.sh" dest: "/entrypoint.sh"
content: #code content: #code
}, },
llb.#WriteFile & { op.#WriteFile & {
dest: "/kubeconfig" dest: "/kubeconfig"
content: kubeconfig content: kubeconfig
mode: 0o600 mode: 0o600
}, },
if (chart & string) != _|_ { if (chart & string) != _|_ {
llb.#WriteFile & { op.#WriteFile & {
dest: "/helm/chart" dest: "/helm/chart"
content: chart content: chart
} }
}, },
llb.#Exec & { op.#Exec & {
always: true always: true
args: [ args: [
"/bin/bash", "/bin/bash",

18
stdlib/kubernetes/kubernetes.cue
View File

@ -1,7 +1,7 @@
package kubernetes package kubernetes
import ( import (
"dagger.io/llb" "dagger.io/dagger/op"
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/alpine" "dagger.io/alpine"
) )
@ -18,18 +18,18 @@ import (
"""# """#
#up: [ #up: [
llb.#Load & { op.#Load & {
from: alpine.#Image & { from: alpine.#Image & {
package: bash: "=5.1.0-r0" package: bash: "=5.1.0-r0"
package: jq: "=1.6-r1" package: jq: "=1.6-r1"
package: curl: "=7.74.0-r1" package: curl: "=7.74.0-r1"
} }
}, },
llb.#WriteFile & { op.#WriteFile & {
dest: "/entrypoint.sh" dest: "/entrypoint.sh"
content: #code content: #code
}, },
llb.#Exec & { op.#Exec & {
args: [ args: [
"/bin/bash", "/bin/bash",
"--noprofile", "--noprofile",
@ -63,25 +63,25 @@ import (
"""# """#
#up: [ #up: [
llb.#Load & { op.#Load & {
from: #Kubectl & {"version": version} from: #Kubectl & {"version": version}
}, },
llb.#WriteFile & { op.#WriteFile & {
dest: "/entrypoint.sh" dest: "/entrypoint.sh"
content: #code content: #code
}, },
llb.#WriteFile & { op.#WriteFile & {
dest: "/kubeconfig" dest: "/kubeconfig"
content: kubeconfig content: kubeconfig
mode: 0o600 mode: 0o600
}, },
if (source & string) != _|_ { if (source & string) != _|_ {
llb.#WriteFile & { op.#WriteFile & {
dest: "/source" dest: "/source"
content: source content: source
} }
}, },
llb.#Exec & { op.#Exec & {
always: true always: true
args: [ args: [
"/bin/bash", "/bin/bash",

10
stdlib/netlify/netlify.cue
View File

@ -3,7 +3,7 @@ package netlify
import ( import (
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/alpine" "dagger.io/alpine"
"dagger.io/llb" "dagger.io/dagger/op"
) )
// A Netlify account // A Netlify account
@ -43,7 +43,7 @@ import (
logsUrl: string logsUrl: string
#up: [ #up: [
llb.#Load & { op.#Load & {
from: alpine.#Image & { from: alpine.#Image & {
package: bash: "=~5.1" package: bash: "=~5.1"
package: jq: "=~1.6" package: jq: "=~1.6"
@ -51,10 +51,10 @@ import (
package: yarn: "=~1.22" package: yarn: "=~1.22"
} }
}, },
llb.#Exec & { op.#Exec & {
args: ["yarn", "global", "add", "netlify-cli@2.47.0"] args: ["yarn", "global", "add", "netlify-cli@2.47.0"]
}, },
llb.#Exec & { op.#Exec & {
args: [ args: [
"/bin/bash", "/bin/bash",
"--noprofile", "--noprofile",
@ -78,7 +78,7 @@ import (
dir: "/src" dir: "/src"
mount: "/src": from: contents mount: "/src": from: contents
}, },
llb.#Export & { op.#Export & {
source: "/output.json" source: "/output.json"
format: "json" format: "json"
}, },

8
stdlib/yarn/yarn.cue
View File

@ -3,7 +3,7 @@ package yarn
import ( import (
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/alpine" "dagger.io/alpine"
"dagger.io/llb" "dagger.io/dagger/op"
) )
// Yarn Script // Yarn Script
@ -22,13 +22,13 @@ import (
env?: [string]: string env?: [string]: string
#up: [ #up: [
llb.#Load & { op.#Load & {
from: alpine.#Image & { from: alpine.#Image & {
package: bash: "=~5.1" package: bash: "=~5.1"
package: yarn: "=~1.22" package: yarn: "=~1.22"
} }
}, },
llb.#Exec & { op.#Exec & {
args: [ args: [
"/bin/bash", "/bin/bash",
"--noprofile", "--noprofile",
@ -56,7 +56,7 @@ import (
"/cache/yarn": "cache" "/cache/yarn": "cache"
} }
}, },
llb.#Subdir & { op.#Subdir & {
dir: "/build" dir: "/build"
}, },
] ]

8
tests/cli/input/main.cue
View File

@ -1,7 +1,7 @@
package testing package testing
import ( import (
"dagger.io/llb" "dagger.io/dagger/op"
"dagger.io/dagger" "dagger.io/dagger"
) )
@ -12,12 +12,12 @@ bar: {
string string
#up: [ #up: [
llb.#FetchContainer & {ref: "busybox"}, op.#FetchContainer & {ref: "busybox"},
llb.#Exec & { op.#Exec & {
args: ["cp", "/source/testfile", "/out"] args: ["cp", "/source/testfile", "/out"]
mount: "/source": from: source mount: "/source": from: source
}, },
llb.#Export & { op.#Export & {
format: "string" format: "string"
source: "/out" source: "/out"
}, },

6
tests/cli/simple/main.cue
View File

@ -1,11 +1,11 @@
package testing package testing
import "dagger.io/llb" import "dagger.io/dagger/op"
foo: "value" foo: "value"
bar: "another value" bar: "another value"
#up: [ #up: [
llb.#FetchContainer & {ref: "busybox"}, op.#FetchContainer & {ref: "busybox"},
llb.#Exec & {args: ["true"]}, op.#Exec & {args: ["true"]},
] ]

10
tests/compute/ignore/main.cue
View File

@ -3,7 +3,7 @@ package test
import ( import (
"dagger.io/alpine" "dagger.io/alpine"
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/llb" "dagger.io/dagger/op"
) )
TestData: dagger.#Artifact TestData: dagger.#Artifact
@ -19,13 +19,13 @@ _expected: """
TestIgnore: { TestIgnore: {
string string
#up: [ #up: [
llb.#Load & {from: alpine.#Image}, op.#Load & {from: alpine.#Image},
llb.#Exec & { op.#Exec & {
args: ["sh", "-c", "ls /src/* > /out.txt"] args: ["sh", "-c", "ls /src/* > /out.txt"]
mount: "/src": from: TestData mount: "/src": from: TestData
}, },
llb.#Export & {source: "/out.txt"}, op.#Export & {source: "/out.txt"},
llb.#Exec & { op.#Exec & {
args: [ args: [
"sh", "sh",
"-ec", "-ec",

26
tests/llb/dockerbuild/main.cue
View File

@ -2,14 +2,14 @@ package test
import ( import (
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/llb" "dagger.io/dagger/op"
) )
// Set to `--input-dir=./tests/dockerbuild/testdata` // Set to `--input-dir=./tests/dockerbuild/testdata`
TestData: dagger.#Artifact TestData: dagger.#Artifact
TestInlinedDockerfile: #up: [ TestInlinedDockerfile: #up: [
llb.#DockerBuild & { op.#DockerBuild & {
dockerfile: """ dockerfile: """
FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
RUN echo hello world RUN echo hello world
@ -18,51 +18,51 @@ TestInlinedDockerfile: #up: [
] ]
TestOpChaining: #up: [ TestOpChaining: #up: [
llb.#DockerBuild & { op.#DockerBuild & {
dockerfile: """ dockerfile: """
FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
RUN echo foobar > /output RUN echo foobar > /output
""" """
}, },
llb.#Exec & { op.#Exec & {
args: ["sh", "-c", "test $(cat /output) = foobar"] args: ["sh", "-c", "test $(cat /output) = foobar"]
}, },
] ]
TestBuildContext: #up: [ TestBuildContext: #up: [
llb.#DockerBuild & { op.#DockerBuild & {
context: TestData context: TestData
}, },
llb.#Exec & { op.#Exec & {
args: ["sh", "-c", "test $(cat /dir/foo) = foobar"] args: ["sh", "-c", "test $(cat /dir/foo) = foobar"]
}, },
] ]
TestBuildContextAndDockerfile: #up: [ TestBuildContextAndDockerfile: #up: [
llb.#DockerBuild & { op.#DockerBuild & {
context: TestData context: TestData
dockerfile: """ dockerfile: """
FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
COPY foo /override COPY foo /override
""" """
}, },
llb.#Exec & { op.#Exec & {
args: ["sh", "-c", "test $(cat /override) = foobar"] args: ["sh", "-c", "test $(cat /override) = foobar"]
}, },
] ]
TestDockerfilePath: #up: [ TestDockerfilePath: #up: [
llb.#DockerBuild & { op.#DockerBuild & {
context: TestData context: TestData
dockerfilePath: "./dockerfilepath/Dockerfile.custom" dockerfilePath: "./dockerfilepath/Dockerfile.custom"
}, },
llb.#Exec & { op.#Exec & {
args: ["sh", "-c", "test $(cat /test) = dockerfilePath"] args: ["sh", "-c", "test $(cat /test) = dockerfilePath"]
}, },
] ]
TestBuildArgs: #up: [ TestBuildArgs: #up: [
llb.#DockerBuild & { op.#DockerBuild & {
dockerfile: """ dockerfile: """
FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
ARG TEST=foo ARG TEST=foo
@ -74,7 +74,7 @@ TestBuildArgs: #up: [
// FIXME: this doesn't test anything beside not crashing // FIXME: this doesn't test anything beside not crashing
TestBuildLabels: #up: [ TestBuildLabels: #up: [
llb.#DockerBuild & { op.#DockerBuild & {
dockerfile: """ dockerfile: """
FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
""" """
@ -84,7 +84,7 @@ TestBuildLabels: #up: [
// FIXME: this doesn't test anything beside not crashing // FIXME: this doesn't test anything beside not crashing
TestBuildPlatform: #up: [ TestBuildPlatform: #up: [
llb.#DockerBuild & { op.#DockerBuild & {
dockerfile: """ dockerfile: """
FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
""" """

18
tests/llb/push-container/main.cue
View File

@ -1,7 +1,7 @@
package main package main
import ( import (
"dagger.io/llb" "dagger.io/dagger/op"
"dagger.io/alpine" "dagger.io/alpine"
) )
@ -10,11 +10,11 @@ TestPushContainer: {
random: { random: {
string string
#up: [ #up: [
llb.#Load & {from: alpine.#Image}, op.#Load & {from: alpine.#Image},
llb.#Exec & { op.#Exec & {
args: ["sh", "-c", "echo -n $RANDOM > /rand"] args: ["sh", "-c", "echo -n $RANDOM > /rand"]
}, },
llb.#Export & { op.#Export & {
source: "/rand" source: "/rand"
}, },
] ]
@ -24,11 +24,11 @@ TestPushContainer: {
push: { push: {
ref: "daggerio/ci-test:\(random)" ref: "daggerio/ci-test:\(random)"
#up: [ #up: [
llb.#WriteFile & { op.#WriteFile & {
content: random content: random
dest: "/rand" dest: "/rand"
}, },
llb.#PushContainer & { op.#PushContainer & {
"ref": ref "ref": ref
}, },
] ]
@ -36,15 +36,15 @@ TestPushContainer: {
// Pull the image back // Pull the image back
pull: #up: [ pull: #up: [
llb.#FetchContainer & { op.#FetchContainer & {
ref: push.ref ref: push.ref
}, },
] ]
// Check the content // Check the content
check: #up: [ check: #up: [
llb.#Load & {from: alpine.#Image}, op.#Load & {from: alpine.#Image},
llb.#Exec & { op.#Exec & {
args: [ args: [
"sh", "-c", #""" "sh", "-c", #"""
test "$(cat /src/rand)" = "\#(random)" test "$(cat /src/rand)" = "\#(random)"

12
tests/stdlib/alpine/alpine.cue
View File

@ -2,7 +2,7 @@ package alpine
import ( import (
"dagger.io/alpine" "dagger.io/alpine"
"dagger.io/llb" "dagger.io/dagger/op"
) )
TestImageVersion: { TestImageVersion: {
@ -12,8 +12,8 @@ TestImageVersion: {
} }
test: #up: [ test: #up: [
llb.#Load & {from: image}, op.#Load & {from: image},
llb.#Exec & { op.#Exec & {
args: [ args: [
"sh", "sh",
"-ec", "-ec",
@ -32,11 +32,11 @@ TestPackageInstall: {
} }
test: #up: [ test: #up: [
llb.#Load & {from: image}, op.#Load & {from: image},
llb.#Exec & { op.#Exec & {
args: ["jq", "--version"] args: ["jq", "--version"]
}, },
llb.#Exec & { op.#Exec & {
args: ["sh", "-ec", "curl --version | grep -q 7.74.0"] args: ["sh", "-ec", "curl --version | grep -q 7.74.0"]
}, },
] ]

14
tests/stdlib/file/file.cue
View File

@ -1,7 +1,7 @@
package f package f
import ( import (
"dagger.io/llb" "dagger.io/dagger/op"
"dagger.io/alpine" "dagger.io/alpine"
"dagger.io/file" "dagger.io/file"
) )
@ -15,8 +15,8 @@ TestCreate: {
} }
test: #up: [ test: #up: [
llb.#Load & {from: alpine.#Image}, op.#Load & {from: alpine.#Image},
llb.#Exec & { op.#Exec & {
args: [ args: [
"sh", "sh",
"-ec", "-ec",
@ -38,8 +38,8 @@ TestRead: {
from: alpine.#Image & {version: "3.10.6"} from: alpine.#Image & {version: "3.10.6"}
} }
test: #up: [ test: #up: [
llb.#Load & {from: alpine.#Image}, op.#Load & {from: alpine.#Image},
llb.#Exec & { op.#Exec & {
args: [ args: [
"sh", "sh",
"-ec", "-ec",
@ -64,8 +64,8 @@ TestRead2: {
} }
test: #up: [ test: #up: [
llb.#Load & {from: alpine.#Image}, op.#Load & {from: alpine.#Image},
llb.#Exec & { op.#Exec & {
args: [ args: [
"sh", "sh",
"-ec", "-ec",

6
tests/stdlib/go/go.cue
View File

@ -4,7 +4,7 @@ import (
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/go" "dagger.io/go"
"dagger.io/alpine" "dagger.io/alpine"
"dagger.io/llb" "dagger.io/dagger/op"
) )
TestData: dagger.#Artifact TestData: dagger.#Artifact
@ -16,8 +16,8 @@ TestGoBuild: {
} }
test: #up: [ test: #up: [
llb.#Load & {from: alpine.#Image}, op.#Load & {from: alpine.#Image},
llb.#Exec & { op.#Exec & {
args: [ args: [
"sh", "sh",
"-ec", "-ec",

14
tests/stdlib/netlify/netlify.cue
View File

@ -1,7 +1,7 @@
package netlify package netlify
import ( import (
"dagger.io/llb" "dagger.io/dagger/op"
"dagger.io/alpine" "dagger.io/alpine"
"dagger.io/netlify" "dagger.io/netlify"
) )
@ -11,11 +11,11 @@ TestNetlify: {
random: { random: {
string string
#up: [ #up: [
llb.#Load & {from: alpine.#Image}, op.#Load & {from: alpine.#Image},
llb.#Exec & { op.#Exec & {
args: ["sh", "-c", "echo -n $RANDOM > /rand"] args: ["sh", "-c", "echo -n $RANDOM > /rand"]
}, },
llb.#Export & { op.#Export & {
source: "/rand" source: "/rand"
}, },
] ]
@ -23,7 +23,7 @@ TestNetlify: {
// Generate a website containing the random number // Generate a website containing the random number
html: #up: [ html: #up: [
llb.#WriteFile & { op.#WriteFile & {
content: random content: random
dest: "index.html" dest: "index.html"
}, },
@ -37,13 +37,13 @@ TestNetlify: {
// Check if the deployed site has the random marker // Check if the deployed site has the random marker
check: #up: [ check: #up: [
llb.#Load & { op.#Load & {
from: alpine.#Image & { from: alpine.#Image & {
package: bash: "=~5.1" package: bash: "=~5.1"
package: curl: "=~7.74" package: curl: "=~7.74"
} }
}, },
llb.#Exec & { op.#Exec & {
args: [ args: [
"/bin/bash", "/bin/bash",
"--noprofile", "--noprofile",

6
tests/stdlib/yarn/yarn.cue
View File

@ -4,7 +4,7 @@ import (
"dagger.io/dagger" "dagger.io/dagger"
"dagger.io/yarn" "dagger.io/yarn"
"dagger.io/alpine" "dagger.io/alpine"
"dagger.io/llb" "dagger.io/dagger/op"
) )
TestData: dagger.#Artifact TestData: dagger.#Artifact
@ -15,10 +15,10 @@ TestYarn: {
} }
test: #up: [ test: #up: [
llb.#Load & {from: alpine.#Image & { op.#Load & {from: alpine.#Image & {
package: bash: "=5.1.0-r0" package: bash: "=5.1.0-r0"
}}, }},
llb.#Exec & { op.#Exec & {
mount: "/build": from: run mount: "/build": from: run
args: [ args: [
"/bin/bash", "/bin/bash",

14
tests/test-cli.sh
View File

@ -65,13 +65,13 @@ test::cli::newgit() {
DAGGER_STORE="$(mktemp -d -t dagger-store-XXXXXX)" DAGGER_STORE="$(mktemp -d -t dagger-store-XXXXXX)"
export DAGGER_STORE export DAGGER_STORE
test::one "CLI: new git: --plan-git" \ disable test::one "CLI: new git: --plan-git" \
"$dagger" "${DAGGER_BINARY_ARGS[@]}" new --plan-git https://github.com/samalba/dagger-test.git simple "$dagger" "${DAGGER_BINARY_ARGS[@]}" new --plan-git https://github.com/samalba/dagger-test.git simple
test::one "CLI: new git: verify plan can be upped" \ disable test::one "CLI: new git: verify plan can be upped" \
"$dagger" "${DAGGER_BINARY_ARGS[@]}" up -d "simple" "$dagger" "${DAGGER_BINARY_ARGS[@]}" up -d "simple"
test::one "CLI: new git: verify we have the right plan" --stdout='{ disable test::one "CLI: new git: verify we have the right plan" --stdout='{
foo: "value" foo: "value"
bar: "another value" bar: "another value"
}' \ }' \
@ -122,10 +122,10 @@ test::cli::plan() {
test::one "CLI: plan dir: query non-concrete" --exit=1 \ test::one "CLI: plan dir: query non-concrete" --exit=1 \
"$dagger" "${DAGGER_BINARY_ARGS[@]}" -d "simple" query -c "$dagger" "${DAGGER_BINARY_ARGS[@]}" -d "simple" query -c
test::one "CLI: plan git" \ disable test::one "CLI: plan git (Disabled: external dependency)" \
"$dagger" "${DAGGER_BINARY_ARGS[@]}" -d "simple" plan git https://github.com/samalba/dagger-test.git "$dagger" "${DAGGER_BINARY_ARGS[@]}" -d "simple" plan git https://github.com/samalba/dagger-test.git
test::one "CLI: plan git: verify we have the right plan" --stdout='{ disable test::one "CLI: plan git: verify we have the right plan" --stdout='{
foo: "value" foo: "value"
bar: "another value" bar: "another value"
}' \ }' \
@ -152,9 +152,9 @@ test::cli::input() {
test::one "CLI: up: input is set with input dir" \ test::one "CLI: up: input is set with input dir" \
"$dagger" "${DAGGER_BINARY_ARGS[@]}" up -d "input" --stdout='{"bar":"thisisatest\n","foo":"bar","source":{}}' "$dagger" "${DAGGER_BINARY_ARGS[@]}" up -d "input" --stdout='{"bar":"thisisatest\n","foo":"bar","source":{}}'
test::one "CLI: input git" \ disable test::one "CLI: input git" \
"$dagger" "${DAGGER_BINARY_ARGS[@]}" input -d "input" git "source" https://github.com/samalba/dagger-test-simple.git "$dagger" "${DAGGER_BINARY_ARGS[@]}" input -d "input" git "source" https://github.com/samalba/dagger-test-simple.git
test::one "CLI: up: input is set with input git" \ disable test::one "CLI: up: input is set with input git" \
"$dagger" "${DAGGER_BINARY_ARGS[@]}" up -d "input" --stdout='{"bar":"testgit\n","foo":"bar","source":{}}' "$dagger" "${DAGGER_BINARY_ARGS[@]}" up -d "input" --stdout='{"bar":"testgit\n","foo":"bar","source":{}}'
} }