diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-02 14:03:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-02 14:03:38 +0000 |
| commit | a48df504069ac5f2adfc88216bfcaf061d8ea829 (patch) | |
| tree | b1308c000cbb4ba24c079542374b47f86caa936f | |
| parent | 4a7ac19f2777913bbd7152aa08395411b5fe05c3 (diff) | |
| download | gitlab-ce-a48df504069ac5f2adfc88216bfcaf061d8ea829.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-1-stable-ee
| -rw-r--r-- | lib/container_registry/client.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb index 8dea765dd11..cc692140301 100644 --- a/lib/container_registry/client.rb +++ b/lib/container_registry/client.rb @@ -11,6 +11,7 @@ module ContainerRegistry attr_accessor :uri DOCKER_DISTRIBUTION_MANIFEST_V2_TYPE = 'application/vnd.docker.distribution.manifest.v2+json' + DOCKER_DISTRIBUTION_MANIFEST_LIST_V2_TYPE = 'application/vnd.docker.distribution.manifest.list.v2+json' OCI_MANIFEST_V1_TYPE = 'application/vnd.oci.image.manifest.v1+json' CONTAINER_IMAGE_V1_TYPE = 'application/vnd.docker.container.image.v1+json' REGISTRY_VERSION_HEADER = 'gitlab-container-registry-version' @@ -19,6 +20,8 @@ module ContainerRegistry ACCEPTED_TYPES = [DOCKER_DISTRIBUTION_MANIFEST_V2_TYPE, OCI_MANIFEST_V1_TYPE].freeze + ACCEPTED_TYPES_RAW = [DOCKER_DISTRIBUTION_MANIFEST_V2_TYPE, OCI_MANIFEST_V1_TYPE, DOCKER_DISTRIBUTION_MANIFEST_LIST_V2_TYPE].freeze + # Taken from: FaradayMiddleware::FollowRedirects REDIRECT_CODES = Set.new [301, 302, 303, 307] |