Merge pull request #437 from ehazlett/fix-warn-no-internet-b2d

add timeout for b2d release check; warn instead of error if cannot check
This commit is contained in:
Evan Hazlett 2015-02-02 09:11:19 -05:00
commit 55ea356124
4 changed files with 31 additions and 5 deletions

View File

@ -143,7 +143,7 @@ func (d *Driver) Create() error {
// until then always use "latest"
isoURL, err = utils.GetLatestBoot2DockerReleaseURL()
if err != nil {
return err
log.Warnf("Unable to check for the latest release: %s", err)
}
// todo: use real constant for .docker

View File

@ -151,7 +151,7 @@ func (d *Driver) Create() error {
// until then always use "latest"
isoURL, err = utils.GetLatestBoot2DockerReleaseURL()
if err != nil {
return err
log.Warnf("Unable to check for the latest release: %s", err)
}
// todo: use real constant for .docker

View File

@ -245,7 +245,7 @@ func (d *Driver) Create() error {
// until then always use "latest"
isoURL, err = utils.GetLatestBoot2DockerReleaseURL()
if err != nil {
return err
log.Warnf("Unable to check for the latest release: %s", err)
}
rootPath := utils.GetDockerDir()

View File

@ -5,15 +5,39 @@ import (
"fmt"
"io"
"io/ioutil"
"net"
"net/http"
"os"
"path/filepath"
"time"
)
const (
timeout = time.Second * 5
)
func defaultTimeout(network, addr string) (net.Conn, error) {
return net.DialTimeout(network, addr, timeout)
}
func getClient() *http.Client {
transport := http.Transport{
Dial: defaultTimeout,
}
client := http.Client{
Transport: &transport,
}
return &client
}
// Get the latest boot2docker release tag name (e.g. "v0.6.0").
// FIXME: find or create some other way to get the "latest release" of boot2docker since the GitHub API has a pretty low rate limit on API requests
func GetLatestBoot2DockerReleaseURL() (string, error) {
rsp, err := http.Get("https://api.github.com/repos/boot2docker/boot2docker/releases")
client := getClient()
rsp, err := client.Get("https://api.github.com/repos/boot2docker/boot2docker/releases")
if err != nil {
return "", err
}
@ -36,7 +60,9 @@ func GetLatestBoot2DockerReleaseURL() (string, error) {
// Download boot2docker ISO image for the given tag and save it at dest.
func DownloadISO(dir, file, url string) error {
rsp, err := http.Get(url)
client := getClient()
rsp, err := client.Get(url)
if err != nil {
return err
}