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

if we can't connect to the server when setting up, return a nil roundtripper. Check roundtripper when initializing HTTPStore and substitute an OfflineStore if it is nil. 

Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
This commit is contained in:
David Lawrence 2016-01-15 17:28:26 -08:00
parent cf0bb5a9be
commit 46682b71eb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/notary/tuf.go
View File

@ -426,7 +426,9 @@ func tokenAuth(config *viper.Viper, baseTransport *http.Transport, gun string,
} }
resp, err := pingClient.Do(req) resp, err := pingClient.Do(req)
if err != nil { if err != nil {
fatalf(err.Error()) logrus.Errorf("could not reach %s: %s", trustServerURL, err.Error())
logrus.Info("continuing in offline mode")
return nil
} }
defer resp.Body.Close() defer resp.Body.Close()

3
tuf/store/httpstore.go
View File

@ -85,6 +85,9 @@ func NewHTTPStore(baseURL, metaPrefix, metaExtension, targetsPrefix, keyExtensio
if !base.IsAbs() { if !base.IsAbs() {
return nil, errors.New("HTTPStore requires an absolute baseURL") return nil, errors.New("HTTPStore requires an absolute baseURL")
} }
if roundTrip == nil {
return &OfflineStore{}, nil
}
return &HTTPStore{ return &HTTPStore{
baseURL: *base, baseURL: *base,
metaPrefix: metaPrefix, metaPrefix: metaPrefix,