Skip to content

Commit

Permalink
updated dep
Browse files Browse the repository at this point in the history
  • Loading branch information
adranwit committed May 7, 2024
1 parent 3d76b58 commit 2146ebf
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.75.0
0.75.1
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ require (
github.com/viant/dsc v0.19.0
github.com/viant/dsunit v0.11.1-0.20240315154953-016b93c322c2
github.com/viant/scy v0.9.1
github.com/viant/toolbox v0.37.0
github.com/viant/toolbox v0.37.1-0.20240507184908-f12292b1abfb
github.com/yuin/gopher-lua v0.0.0-20221210110428-332342483e3f // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/net v0.23.0
Expand Down
6 changes: 6 additions & 0 deletions model/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ func (t *TransientTemplate) Expand(task *Task, parentTag string, inline *Inlined
tag.Group = task.Name
index := iterator.Index()
state := t.buildTagState(index, tag, instances)
if state == nil {
continue
}
tagPath := state.GetString("path")
t.inline.tagPathURL = tagPath
if len(t.Data) > 0 {
Expand Down Expand Up @@ -254,6 +257,9 @@ func (t *TransientTemplate) buildTagState(index string, tag *Tag, instances *gra
state.Put("index", index)
if t.SubPath != "" {
instance := instances.Lookup(toolbox.AsInt(index))
if instance == nil {
return nil
}
if index := strings.LastIndex(t.SubPath, "/"); index != -1 {
parent, _ := path.Split(t.SubPath)
tag.Subpath = path.Join(parent, instance.Object.Name())
Expand Down
7 changes: 4 additions & 3 deletions service/system/docker/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ func (s *service) run(context *endly.Context, request *RunRequest) (*RunResponse
ImagePullOptions: request.ImagePullOptions,
}

pullRequest.Platform = request.Platform
if _, err := s.pull(context, pullRequest); err != nil {
return nil, fmt.Errorf("unable to pull %v, %v", request.Image, err)
}
Expand All @@ -141,7 +142,7 @@ func (s *service) run(context *endly.Context, request *RunRequest) (*RunResponse
}
}
createRequest := request.CreateContainerRequest()
createResponse := &container.ContainerCreateCreatedBody{}
createResponse := &container.CreateResponse{}
if err := runAdapter(context, createRequest, createResponse); err != nil {
return nil, err
}
Expand Down Expand Up @@ -523,8 +524,8 @@ func (s *service) logs(context *endly.Context, request *LogsRequest) (*LogsRespo
}
var reader io.ReadCloser
logRequest := &ContainerLogsRequest{
ContainerLogsOptions: *request.ContainerLogsOptions,
Container: status.Containers[0].ID,
LogsOptions: *request.LogsOptions,
Container: status.Containers[0].ID,
}
err = runAdapter(context, logRequest, &reader)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions service/system/exec/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@ const (
"URL": "scp://127.0.0.1/",
"Credentials": "${env.HOME}/.secret/localhost.json"
},
"CheckError": true,
"Commands":["mkdir /tmp/app1"]
}`

Expand Down

0 comments on commit 2146ebf

Please sign in to comment.