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

Merge pull request #892 from docker/fix_log_stream_end 

Avoid nil pointer when reading logs of a just terminated container.
This commit is contained in:
Guillaume Tardif 2020-11-10 14:06:51 +01:00 committed by GitHub
parent 2b8fa9934e 40334d570a
commit 1cc0ccb189
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aci/aci.go
View File

@ -282,6 +282,9 @@ func getACIContainerLogs(ctx context.Context, aciContext store.AciContext, conta
if err != nil { if err != nil {
return "", fmt.Errorf("cannot get container logs: %v", err) return "", fmt.Errorf("cannot get container logs: %v", err)
} }
if logs.Content == nil {
return "", nil
}
return *logs.Content, err return *logs.Content, err
} }