mirror of
https://github.com/genuinetools/reg.git
synced 2024-06-30 11:04:16 -04:00
cleanup
Signed-off-by: Jess Frazelle <acidburn@google.com>
This commit is contained in:
parent
3b3a740f26
commit
7b8e259c36
|
@ -198,22 +198,19 @@ func createStaticIndex(r *registry.Registry, staticDir, clairURI string) error {
|
||||||
for j, tag := range tags {
|
for j, tag := range tags {
|
||||||
// get the manifest
|
// get the manifest
|
||||||
|
|
||||||
manifest, err := r.Manifest(repo, tag)
|
m1, err := r.ManifestV1(repo, tag)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("getting tags for %s:%s failed: %v", repo, tag, err)
|
return fmt.Errorf("getting tags for %s:%s failed: %v", repo, tag, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var createdDate string
|
var createdDate string
|
||||||
if m1, ok := manifest.(schema1.SignedManifest); ok {
|
for _, h := range m1.History {
|
||||||
history := m1.History
|
var comp v1Compatibility
|
||||||
for _, h := range history {
|
if err := json.Unmarshal([]byte(h.V1Compatibility), &comp); err != nil {
|
||||||
var comp v1Compatibility
|
return fmt.Errorf("unmarshal v1compatibility failed: %v", err)
|
||||||
if err := json.Unmarshal([]byte(h.V1Compatibility), &comp); err != nil {
|
|
||||||
return fmt.Errorf("unmarshal v1compatibility failed: %v", err)
|
|
||||||
}
|
|
||||||
createdDate = humanize.Time(comp.Created)
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
|
createdDate = humanize.Time(comp.Created)
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
repoURI := fmt.Sprintf("%s/%s", r.Domain, repo)
|
repoURI := fmt.Sprintf("%s/%s", r.Domain, repo)
|
||||||
|
@ -239,7 +236,7 @@ func createStaticIndex(r *registry.Registry, staticDir, clairURI string) error {
|
||||||
|
|
||||||
logrus.Infof("creating vulns.txt for %s:%s", repo, tag)
|
logrus.Infof("creating vulns.txt for %s:%s", repo, tag)
|
||||||
|
|
||||||
if err := createVulnStaticPage(r, staticDir, clairURI, repo, tag); err != nil {
|
if err := createVulnStaticPage(r, staticDir, clairURI, repo, tag, m1); err != nil {
|
||||||
// return fmt.Errorf("creating vuln static page for %s:%s failed: %v", repo, tag, err)
|
// return fmt.Errorf("creating vuln static page for %s:%s failed: %v", repo, tag, err)
|
||||||
logrus.Warnf("creating vuln static page for %s:%s failed: %v", repo, tag, err)
|
logrus.Warnf("creating vuln static page for %s:%s failed: %v", repo, tag, err)
|
||||||
}
|
}
|
||||||
|
@ -285,13 +282,7 @@ func createStaticIndex(r *registry.Registry, staticDir, clairURI string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func createVulnStaticPage(r *registry.Registry, staticDir, clairURI, repo, tag string) error {
|
func createVulnStaticPage(r *registry.Registry, staticDir, clairURI, repo, tag string, m schema1.SignedManifest) error {
|
||||||
// get the manifest
|
|
||||||
m, err := r.ManifestV1(repo, tag)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// filter out the empty layers
|
// filter out the empty layers
|
||||||
var filteredLayers []schema1.FSLayer
|
var filteredLayers []schema1.FSLayer
|
||||||
for _, layer := range m.FSLayers {
|
for _, layer := range m.FSLayers {
|
||||||
|
|
Loading…
Reference in a new issue