diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-07-24 21:44:07 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-07-25 04:11:38 -0700 |
| commit | a40116065e2a761f6fa8dc7d569cb3e39025f6d3 (patch) | |
| tree | 64d0d2ba3cfdc8f1cbc57c4fa7bc21ae7044a01b /lib/container_registry | |
| parent | a5eaefc9027696fc65b7d51251902e013c14d161 (diff) | |
| download | gitlab-ce-a40116065e2a761f6fa8dc7d569cb3e39025f6d3.tar.gz | |
Support Docker OCI imagessh-support-docker-oci-images
Docker Distribution v2.7.0 shipped with OCI support, but our container
registry client was not updated to handle the manifest format in the
HTTP `Accept` header. As a result, API calls to retrieve a manifest
would return with an error, "OCI manifest found, but accept header does
not support OCI manifests". This would result in blank fields in the
container registry page and prevent tags from being deleted.
To fix this, we just need to add
`application/vnd.oci.image.manifest.v1+json` to the `Accept` header and
configure Faraday to parse the response as JSON. The response structure
is the same as the standard Docker Distribution V2 manifest.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58685
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/12877
Diffstat (limited to 'lib/container_registry')
| -rw-r--r-- | lib/container_registry/client.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb index c80f49f5ae0..c3a19af7a94 100644 --- a/lib/container_registry/client.rb +++ b/lib/container_registry/client.rb @@ -7,7 +7,9 @@ module ContainerRegistry class Client attr_accessor :uri - MANIFEST_VERSION = 'application/vnd.docker.distribution.manifest.v2+json'.freeze + DOCKER_DISTRIBUTION_MANIFEST_V2_TYPE = 'application/vnd.docker.distribution.manifest.v2+json' + OCI_MANIFEST_V1_TYPE = 'application/vnd.oci.image.manifest.v1+json' + ACCEPTED_TYPES = [DOCKER_DISTRIBUTION_MANIFEST_V2_TYPE, OCI_MANIFEST_V1_TYPE].freeze # Taken from: FaradayMiddleware::FollowRedirects REDIRECT_CODES = Set.new [301, 302, 303, 307] @@ -60,12 +62,13 @@ module ContainerRegistry end def accept_manifest(conn) - conn.headers['Accept'] = MANIFEST_VERSION + conn.headers['Accept'] = ACCEPTED_TYPES conn.response :json, content_type: 'application/json' conn.response :json, content_type: 'application/vnd.docker.distribution.manifest.v1+prettyjws' conn.response :json, content_type: 'application/vnd.docker.distribution.manifest.v1+json' - conn.response :json, content_type: 'application/vnd.docker.distribution.manifest.v2+json' + conn.response :json, content_type: DOCKER_DISTRIBUTION_MANIFEST_V2_TYPE + conn.response :json, content_type: OCI_MANIFEST_V1_TYPE end def response_body(response, allow_redirect: false) |