github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-09-18 08:15:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1687 from RichardScothern/signature-store

Browse Source 
Remove signature store from registry.
This commit is contained in:
Richard Scothern
2016-05-31 09:09:39 -07:00
parent a5f72a6032 febcee6564
commit 641f102967
20 changed files with 64 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
registry/handlers/app.go
View File

@@ -155,6 +155,7 @@ func NewApp(ctx context.Context, config *configuration.Configuration) *App {
app.configureRedis(config)
app.configureLogHook(config)
options := registrymiddleware.GetRegistryOptions()
if config.Compatibility.Schema1.TrustKey != "" {
app.trustKey, err = libtrust.LoadKeyFile(config.Compatibility.Schema1.TrustKey)
if err != nil {
@@ -169,6 +170,8 @@ func NewApp(ctx context.Context, config *configuration.Configuration) *App {
}
}
options = append(options, storage.Schema1SigningKey(app.trustKey))
if config.HTTP.Host != "" {
u, err := url.Parse(config.HTTP.Host)
if err != nil {
@@ -177,17 +180,10 @@ func NewApp(ctx context.Context, config *configuration.Configuration) *App {
app.httpHost = *u
}
options := registrymiddleware.GetRegistryOptions()
if app.isCache {
options = append(options, storage.DisableDigestResumption)
}
if config.Compatibility.Schema1.DisableSignatureStore {
options = append(options, storage.DisableSchema1Signatures)
options = append(options, storage.Schema1SigningKey(app.trustKey))
}
// configure deletion
if d, ok := config.Storage["delete"]; ok {
e, ok := d["enabled"]