vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

registry/storage: ignore missing tag on delete

Browse source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit 1ba5b3b553)
This commit is contained in:
Stephen J Day 2018-02-06 15:25:51 -08:00 committed by Manuel Rüger
parent 803ff0da68
commit e22abf0fab
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
registry/storage/tagstore.go
View file

@ -122,17 +122,20 @@ func (ts *tagStore) Untag(ctx context.Context, tag string) error {
name: ts.repository.Named().Name(),
tag: tag,
})
switch err.(type) {
case storagedriver.PathNotFoundError:
return distribution.ErrTagUnknown{Tag: tag}
case nil:
break
default:
if err != nil {
return err
}
return ts.blobStore.driver.Delete(ctx, tagPath)
if err := ts.blobStore.driver.Delete(ctx, tagPath); err != nil {
switch err.(type) {
case storagedriver.PathNotFoundError:
return nil // Untag is idempotent, we don't care if it didn't exist
default:
return err
}
}
return nil
}
// linkedBlobStore returns the linkedBlobStore for the named tag, allowing one