tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

retrieve status with get group by name 

Signed-off-by: aiordache <anca.iordache@docker.com>
This commit is contained in:
aiordache 2020-09-07 14:26:10 +02:00
parent 19a707495f
commit b155fe0f2e
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
aci/backend.go
View File

@ -172,7 +172,15 @@ func getContainerGroups(ctx context.Context, subscriptionID string, resourceGrou
return []containerinstance.ContainerGroup{}, err
}
}
return containerGroups, nil
var groups []containerinstance.ContainerGroup
for _, group := range containerGroups {
group, err := groupsClient.Get(ctx, resourceGroup, *group.Name)
if err != nil {
return []containerinstance.ContainerGroup{}, err
}
groups = append(groups, group)
}
return groups, nil
}
func getContainerID(group containerinstance.ContainerGroup, container containerinstance.Container) string {

9
aci/convert/convert.go
View File

@ -452,15 +452,6 @@ func ContainerGroupToContainer(containerID string, cg containerinstance.Containe
// GetStatus returns status for the specified container
func GetStatus(container containerinstance.Container, group containerinstance.ContainerGroup) string {
status := compose.UNKNOWN
if group.ContainerGroupProperties != nil && group.ContainerGroupProperties.ProvisioningState != nil {
status = *group.ContainerGroupProperties.ProvisioningState
switch status {
case "Succeeded":
status = compose.RUNNING
case "Failed":
status = compose.FAILED
}
}
if group.InstanceView != nil && group.InstanceView.State != nil {
status = "Node " + *group.InstanceView.State
}