Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/memory leak #178

Merged
merged 29 commits into from
Apr 1, 2018
Merged

Feature/memory leak #178

Changes from 6 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7ee5b67
Merge pull request #163 from keel-hq/develop
rusenask Mar 17, 2018
6b3a72b
Merge pull request #164 from keel-hq/develop
rusenask Mar 17, 2018
bfcf2b5
Merge pull request #168 from keel-hq/develop
rusenask Mar 25, 2018
7d015aa
updated readme
rusenask Mar 26, 2018
179d11e
Merge pull request #170 from keel-hq/develop
rusenask Mar 27, 2018
7fff187
update helm chart with insecure registry env var
Mar 29, 2018
ca4f8a5
update chart versions. assign the env value to be insecure_registry v…
Mar 29, 2018
8a013ed
insecure_registry default to false
Mar 30, 2018
3fa27f6
eol update
Mar 30, 2018
ea8d5f2
Merge pull request #172 from jacobweinstock/update-helm-chart
rusenask Mar 30, 2018
b8b3669
Merge pull request #175 from keel-hq/develop
rusenask Mar 30, 2018
01f1e67
update Digest to match Get for insecure registries
Mar 30, 2018
d4e1f22
fix
Mar 30, 2018
9df3175
use empty string instead of nil
Mar 30, 2018
b89c52a
fix err is shadowed during return error
Mar 30, 2018
4a249ef
remove return variable names for Digest func
Mar 30, 2018
cf8d4d3
Merge pull request #176 from jacobweinstock/insecure-registry-digest
rusenask Mar 30, 2018
d2270be
updating image
rusenask Mar 31, 2018
5c4d63d
version updated
rusenask Mar 31, 2018
67ca5f1
leaking ticker
rusenask Mar 31, 2018
24474c9
leaking ticker
rusenask Mar 31, 2018
a060b90
update
rusenask Mar 31, 2018
63a9c5d
commiting merge
rusenask Mar 31, 2018
b2aaf46
reusing registry client
rusenask Mar 31, 2018
20cf7e9
adding instrumentation
rusenask Apr 1, 2018
11457f0
prom handler
rusenask Apr 1, 2018
adfbe1e
using registry constructors
rusenask Apr 1, 2018
5afbba3
instrumentation
rusenask Apr 1, 2018
e473962
vendor update
rusenask Apr 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions registry/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type Repository struct {
// Client - generic docker registry client
type Client interface {
Get(opts Opts) (*Repository, error)
Digest(opts Opts) (digest string, err error)
Digest(opts Opts) (string, error)
}

// New - new registry client
Expand Down Expand Up @@ -82,7 +82,7 @@ func (c *DefaultClient) Get(opts Opts) (*Repository, error) {
}

// Digest - get digest for repo
func (c *DefaultClient) Digest(opts Opts) (digest string, err error) {
func (c *DefaultClient) Digest(opts Opts) (string, error) {
if opts.Tag == "" {
return "", ErrTagNotSupplied
}
Expand All @@ -93,15 +93,26 @@ func (c *DefaultClient) Digest(opts Opts) (digest string, err error) {
"tag": opts.Tag,
}).Debug("registry client: getting digest")

hub, err := registry.New(opts.Registry, opts.Username, opts.Password)
if err != nil {
return
var hub *registry.Registry
var err error

if os.Getenv(EnvInsecure) == "true" {
hub, err = registry.NewInsecure(opts.Registry, opts.Username, opts.Password)
if err != nil {
return "", err
}
} else {
hub, err = registry.New(opts.Registry, opts.Username, opts.Password)
if err != nil {
return "", err
}
}

hub.Logf = LogFormatter

manifestDigest, err := hub.ManifestDigest(opts.Name, opts.Tag)
if err != nil {
return
return "", err
}

return manifestDigest.String(), nil
Expand Down