diff --git a/compose.dang b/compose.dang index 3c008ee..06d330d 100644 --- a/compose.dang +++ b/compose.dang @@ -27,8 +27,7 @@ type Compose { prefix marks an enclosing project. """ pub projects(ws: Workspace!): [ComposeProject!]! { - polyfill - .workspace(ws) + ws .findConfigDirs(configNames) .map { projectPath => ComposeProject(path: projectPath, composeImage: composeImage, configNames: configNames) @@ -49,7 +48,7 @@ type Compose { """ let relativeToCwd(ws: Workspace!, filePath: String!): String! { let dirSegments = filePath.trimPrefix("/").split("/").dropLast(1) - let cwdSegments = ws.path.trimPrefix("/").split("/").filter { segment => + let cwdSegments = ws.cwd.trimPrefix("/").split("/").filter { segment => segment != "" and segment != "." } # Longest common prefix: acc only advances while every prior segment matched. diff --git a/dagger.json b/dagger.json index 57524f1..a59cb83 100644 --- a/dagger.json +++ b/dagger.json @@ -1,18 +1,13 @@ { "name": "docker", - "engineVersion": "v0.20.6", + "engineVersion": "v1.0.0-beta.10", "sdk": { "source": "dang" }, "dependencies": [ - { - "name": "polyfill", - "source": "github.com/dagger/polyfill@main", - "pin": "ec3ea84a2351b4beb06ecece951f2e5ef66509ff" - }, { "name": "proxy", "source": "./proxy" } ] -} \ No newline at end of file +} diff --git a/docker.dang b/docker.dang index 8af9f78..c5cab25 100644 --- a/docker.dang +++ b/docker.dang @@ -17,8 +17,7 @@ type Docker { marks an enclosing project. """ pub projects(ws: Workspace!): [DockerProject!]! { - polyfill - .workspace(ws) + ws .findConfigDirs(["Dockerfile"]) .map { projectPath => DockerProject(path: projectPath, lintImage: lintImage) @@ -53,7 +52,7 @@ type Docker { """ let relativeToCwd(ws: Workspace!, filePath: String!): String! { let dirSegments = filePath.trimPrefix("/").split("/").dropLast(1) - let cwdSegments = ws.path.trimPrefix("/").split("/").filter { segment => + let cwdSegments = ws.cwd.trimPrefix("/").split("/").filter { segment => segment != "" and segment != "." } # Longest common prefix: acc only advances while every prior segment matched.