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

Merge pull request #771 from docker/fix_panic_inspect_empty 

Fix panic when invoking inspect with empty container id
This commit is contained in:
Guillaume Tardif 2020-10-13 15:44:33 +02:00 committed by GitHub
parent 9e06f42190 d8cd4038c2
commit 243b0d1b6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aci/containers.go
View File

@ -235,12 +235,15 @@ func (cs *aciContainerService) Delete(ctx context.Context, containerID string, r
func (cs *aciContainerService) Inspect(ctx context.Context, containerID string) (containers.Container, error) { func (cs *aciContainerService) Inspect(ctx context.Context, containerID string) (containers.Container, error) {
groupName, containerName := getGroupAndContainerName(containerID) groupName, containerName := getGroupAndContainerName(containerID)
if containerID == "" {
return containers.Container{}, errors.New("cannot inspect empty container ID")
}
cg, err := getACIContainerGroup(ctx, cs.ctx, groupName) cg, err := getACIContainerGroup(ctx, cs.ctx, groupName)
if err != nil { if err != nil {
return containers.Container{}, err return containers.Container{}, err
} }
if cg.StatusCode == http.StatusNoContent { if cg.IsHTTPStatus(http.StatusNoContent) || cg.ContainerGroupProperties == nil || cg.ContainerGroupProperties.Containers == nil {
return containers.Container{}, errdefs.ErrNotFound return containers.Container{}, errdefs.ErrNotFound
} }