Skip to content

Commit

Permalink
Merge branch 'main' into new-resources
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasjackson authored Oct 24, 2023
2 parents 5a7fb87 + d01d131 commit 4942e66
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 1 deletion.
41 changes: 41 additions & 0 deletions examples/terraform/workspace/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/server/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func (a *API) executeScript(target string, script string, workdir string, user s
il := images.NewImageFileLog(utils.ImageCacheLog())
tz := &tar.TarGz{}
ct, err := container.NewDockerTasks(dc, il, tz, a.log)

if err != nil {
return 254, err.Error()
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"sync"

"github.com/jumppad-labs/jumppad/pkg/utils/dirhash"
"github.com/kennygrant/sanitize"
"github.com/kennygrant/sanitize"
)

// EnsureAbsolute ensure that the given path is either absolute or
Expand Down

0 comments on commit 4942e66

Please sign in to comment.