rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-31 14:36:32 +00:00
Code Issues Releases Wiki Activity

Set timeout on portchecker

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2018-04-19 16:03:14 +02:00
parent dd5b5e7e65
commit 74d38c4552
2 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker/docker.go
View File

@@ -333,8 +333,7 @@ func ReadFileFromContainer(ctx context.Context, dClient *client.Client, hostname
}
func ReadContainerLogs(ctx context.Context, dClient *client.Client, containerName string) (io.ReadCloser, error) {
return dClient.ContainerLogs(ctx, containerName, types.ContainerLogsOptions{ShowStdout: true})
return dClient.ContainerLogs(ctx, containerName, types.ContainerLogsOptions{Follow: true, ShowStdout: true, ShowStderr: true, Timestamps: false})
}
func tryRegistryAuth(pr v3.PrivateRegistry) types.RequestPrivilegeFunc {