Merge pull request #356 from dagger/revert-347-stdlib-import-cycle

Revert "stdlib: dagger.io/dagger/op: stricter typing for load, mount, copy"
This commit is contained in:
Andrea Luzzardi 2021-04-22 12:14:37 -07:00 committed by GitHub
commit 4f91907ac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,11 +1,6 @@
// op: low-level operations for Dagger processing pipelines // op: low-level operations for Dagger processing pipelines
package op package op
// Cue data which can be executed as code
#Runnable: [...#Op] | {#up: [...#Op]
...
}
// One operation in a pipeline // One operation in a pipeline
#Op: #Export | #Op: #Export |
#FetchContainer | #FetchContainer |
@ -38,7 +33,7 @@ package op
#Load: { #Load: {
do: "load" do: "load"
from: #Runnable from: _
} }
#Subdir: { #Subdir: {
@ -53,7 +48,7 @@ package op
// `true` means also ignoring the mount cache volumes // `true` means also ignoring the mount cache volumes
always?: true | *false always?: true | *false
dir: string | *"/" dir: string | *"/"
mount: [string]: "tmpfs" | "cache" | {from: #Runnable, path: string | *"/"} mount: [string]: "tmpfs" | "cache" | {from: _, path: string | *"/"}
} }
#FetchContainer: { #FetchContainer: {
@ -74,7 +69,7 @@ package op
#Copy: { #Copy: {
do: "copy" do: "copy"
from: #Runnable from: _
src: string | *"/" src: string | *"/"
dest: string | *"/" dest: string | *"/"
} }
@ -82,7 +77,7 @@ package op
#DockerBuild: { #DockerBuild: {
do: "docker-build" do: "docker-build"
// We accept either a context, a Dockerfile or both together // We accept either a context, a Dockerfile or both together
context?: #Runnable context?: _
dockerfilePath?: string // path to the Dockerfile (defaults to "Dockerfile") dockerfilePath?: string // path to the Dockerfile (defaults to "Dockerfile")
dockerfile?: string dockerfile?: string