From 877b12fe4bddf7b84122d294ccbe5e02d0649a13 Mon Sep 17 00:00:00 2001 From: Sam Alba Date: Thu, 22 Apr 2021 12:06:56 -0700 Subject: [PATCH] Revert "stdlib: dagger.io/dagger/op: stricter typing for load, mount, copy" This reverts commit 3e2b46bf3aaefdfe552bb8d42513293a286d0481. Signed-off-by: Andrea Luzzardi --- stdlib/dagger/op/op.cue | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/stdlib/dagger/op/op.cue b/stdlib/dagger/op/op.cue index 04c64a81..92ec4c53 100644 --- a/stdlib/dagger/op/op.cue +++ b/stdlib/dagger/op/op.cue @@ -1,11 +1,6 @@ // op: low-level operations for Dagger processing pipelines package op -// Cue data which can be executed as code -#Runnable: [...#Op] | {#up: [...#Op] - ... -} - // One operation in a pipeline #Op: #Export | #FetchContainer | @@ -38,7 +33,7 @@ package op #Load: { do: "load" - from: #Runnable + from: _ } #Subdir: { @@ -53,7 +48,7 @@ package op // `true` means also ignoring the mount cache volumes always?: true | *false dir: string | *"/" - mount: [string]: "tmpfs" | "cache" | {from: #Runnable, path: string | *"/"} + mount: [string]: "tmpfs" | "cache" | {from: _, path: string | *"/"} } #FetchContainer: { @@ -74,7 +69,7 @@ package op #Copy: { do: "copy" - from: #Runnable + from: _ src: string | *"/" dest: string | *"/" } @@ -82,7 +77,7 @@ package op #DockerBuild: { do: "docker-build" // We accept either a context, a Dockerfile or both together - context?: #Runnable + context?: _ dockerfilePath?: string // path to the Dockerfile (defaults to "Dockerfile") dockerfile?: string