MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use 15 minute context timeout for pulling, not 10 seconds... closes #2130

Browse Source
This commit is contained in:
Dane Everitt 2020-06-22 20:56:55 -07:00
parent a3d83d23bd
commit 073247e4e1
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/environment_docker.go
View File

@ -564,7 +564,10 @@ func (d *DockerEnvironment) DisableResourcePolling() error {
// //
// @todo handle authorization & local images // @todo handle authorization & local images
func (d *DockerEnvironment) ensureImageExists(c *client.Client) error { func (d *DockerEnvironment) ensureImageExists(c *client.Client) error {
ctx, _ := context.WithTimeout(context.Background(), time.Second*10) // Give it up to 15 minutes to pull the image. I think this should cover 99.8% of cases where an
// image pull might fail. I can't imagine it will ever take more than 15 minutes to fully pull
// an image. Let me know when I am inevitably wrong here...
ctx, _ := context.WithTimeout(context.Background(), time.Minute*15)
out, err := c.ImagePull(ctx, d.Server.Container.Image, types.ImagePullOptions{All: false}) out, err := c.ImagePull(ctx, d.Server.Container.Image, types.ImagePullOptions{All: false})
if err != nil { if err != nil {