Skip to content

Commit

Permalink
placeholder
Browse files Browse the repository at this point in the history
  • Loading branch information
Jordan Singer committed Feb 6, 2023
1 parent bc28eee commit 20a7dfb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 2 additions & 1 deletion pkg/infra/pulumi_aws/deploylib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,8 @@ export class CloudCCLib {

createImage(execUnitName: string, dockerfilePath: string) {
const image = this.sharedRepo.buildAndPushImage({
context: `./${execUnitName}/${dockerfilePath}`,
context: `./${execUnitName}`,
dockerfile: `./${execUnitName}/${dockerfilePath}`,
extraOptions: ['--platform', 'linux/amd64', '--quiet'],
})
this.execUnitToImage.set(execUnitName, image)
Expand Down
5 changes: 2 additions & 3 deletions pkg/runtime/runtime.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package runtime

import (
"path/filepath"

"github.com/klothoplatform/klotho/pkg/annotation"
"github.com/klothoplatform/klotho/pkg/core"
"github.com/klothoplatform/klotho/pkg/lang/dockerfile"
Expand All @@ -23,10 +21,11 @@ func ShouldOverrideDockerfile(unit *core.ExecutionUnit) bool {
for _, annot := range caps {
cap := annot.Capability
if cap.ID == unit.Name && cap.Name == annotation.ExecutionUnitCapability {
unit.DockerfilePath = filepath.Dir(f.Path())
unit.DockerfilePath = f.Path()
return false
}
}
}
unit.DockerfilePath = "Dockerfile"
return true
}

0 comments on commit 20a7dfb

Please sign in to comment.