tblyler/reg
1
0
Fork 0
mirror of https://github.com/genuinetools/reg.git synced 2024-05-20 12:08:33 -04:00
Code Issues Projects Releases Wiki Activity

Add option to skip ping on creating registry client

Browse source 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
This commit is contained in:
Simon Ferquel 2018-01-17 17:52:39 +01:00
parent 22cbb0f2a0
commit 1efaa929fc
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main.go
View file

@ -49,14 +49,16 @@ func preload(c *cli.Context) (err error) {
return fmt.Errorf("Attempt to use insecure protocol! Use non-ssl option to force")
}
skipPing := c.GlobalBool("no-ping")
// create the registry client
if c.GlobalBool("insecure") {
r, err = registry.NewInsecure(auth, c.GlobalBool("debug"))
r, err = registry.NewInsecure(auth, c.GlobalBool("debug"), !skipPing)
if err != nil {
return err
}
} else {
r, err = registry.New(auth, c.GlobalBool("debug"))
r, err = registry.New(auth, c.GlobalBool("debug"), !skipPing)
if err != nil {
return err
}
@ -101,6 +103,10 @@ func main() {
Usage: "URL to the private registry (ex. r.j3ss.co)",
Value: utils.DefaultDockerRegistry,
},
cli.BoolFlag{
Name: "no-ping",
Usage: "don't ping the registry while establishing connection (usefull for registries where ping is buggy)",
},
}
app.Commands = []cli.Command{
{

16
registry/registry.go
View file

@ -38,25 +38,25 @@ func Log(format string, args ...interface{}) {
}
// New creates a new Registry struct with the given URL and credentials.
func New(auth types.AuthConfig, debug bool) (*Registry, error) {
func New(auth types.AuthConfig, debug, ping bool) (*Registry, error) {
transport := http.DefaultTransport
return newFromTransport(auth, transport, debug)
return newFromTransport(auth, transport, debug, ping)
}
// NewInsecure creates a new Registry struct with the given URL and credentials,
// using a http.Transport that will not verify an SSL certificate.
func NewInsecure(auth types.AuthConfig, debug bool) (*Registry, error) {
func NewInsecure(auth types.AuthConfig, debug, ping bool) (*Registry, error) {
transport := &http.Transport{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
},
}
return newFromTransport(auth, transport, debug)
return newFromTransport(auth, transport, debug, ping)
}
func newFromTransport(auth types.AuthConfig, transport http.RoundTripper, debug bool) (*Registry, error) {
func newFromTransport(auth types.AuthConfig, transport http.RoundTripper, debug, ping bool) (*Registry, error) {
url := strings.TrimSuffix(auth.ServerAddress, "/")
if !reProtocol.MatchString(url) {
@ -95,8 +95,10 @@ func newFromTransport(auth types.AuthConfig, transport http.RoundTripper, debug
Logf: logf,
}
if err := registry.Ping(); err != nil {
return nil, err
if ping {
if err := registry.Ping(); err != nil {
return nil, err
}
}
return registry, nil

4
server/server.go
View file

@ -105,12 +105,12 @@ func main() {
// create the registry client
if c.GlobalBool("insecure") {
r, err = registry.NewInsecure(auth, c.GlobalBool("debug"))
r, err = registry.NewInsecure(auth, c.GlobalBool("debug"), true)
if err != nil {
logrus.Fatal(err)
}
} else {
r, err = registry.New(auth, c.GlobalBool("debug"))
r, err = registry.New(auth, c.GlobalBool("debug"), true)
if err != nil {
logrus.Fatal(err)
}