diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-15 15:07:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-15 15:07:39 +0000 |
| commit | a8b46301907abeeedab4010a966bbd8efc8d370c (patch) | |
| tree | a24d4121c2912b55e9b38689859afd971ac81463 /lib/container_registry/blob.rb | |
| parent | e27de52607369a11ee3cec7fbdd2ffa5cb6e0061 (diff) | |
| parent | 3213023dd657ba6c5c6d690fae2ca44a409b16fd (diff) | |
| download | gitlab-ce-a8b46301907abeeedab4010a966bbd8efc8d370c.tar.gz | |
Merge branch 'docker-registry-manifest-v1' into 'master'
Add support for Docker Registry manifest v1
## What does this MR do?
Adds support for Manifest V1 generated by older versions of Docker (before 1.10).
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18609
See merge request !4669
Diffstat (limited to 'lib/container_registry/blob.rb')
| -rw-r--r-- | lib/container_registry/blob.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/container_registry/blob.rb b/lib/container_registry/blob.rb index 4e20dc4f875..eb5a2596177 100644 --- a/lib/container_registry/blob.rb +++ b/lib/container_registry/blob.rb @@ -18,7 +18,7 @@ module ContainerRegistry end def digest - config['digest'] + config['digest'] || config['blobSum'] end def type |