Fetching docker image manifests with 'Accept' header. Added 'Accept: application/vnd.docker.distribution.manifest.v1+json' to the headers of HTTP requests for fetching manifests from any Docker registry. Some registry services (e.g., Amazon ECR) check the 'Accept' field strictly and reject the requests if it is not specified.
Review: https://reviews.apache.org/r/58725/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/90fe5fa2 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/90fe5fa2 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/90fe5fa2 Branch: refs/heads/1.2.x Commit: 90fe5fa27b4f6e1ba463ae73982f569a25a12ee5 Parents: e0c0879 Author: Chun-Hung Hsiao <[email protected]> Authored: Fri May 5 14:55:33 2017 -0700 Committer: Jie Yu <[email protected]> Committed: Fri May 5 15:04:03 2017 -0700 ---------------------------------------------------------------------- src/uri/fetchers/docker.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/90fe5fa2/src/uri/fetchers/docker.cpp ---------------------------------------------------------------------- diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp index 35e9afa..a13e6f1 100644 --- a/src/uri/fetchers/docker.cpp +++ b/src/uri/fetchers/docker.cpp @@ -328,6 +328,7 @@ private: const URI& uri, const string& directory, const URI& manifestUri, + const http::Headers& manifestHeaders, const http::Response& response); Future<Nothing> __fetch( @@ -468,12 +469,22 @@ Future<Nothing> DockerFetcherPluginProcess::fetch( URI manifestUri = getManifestUri(uri); - return curl(manifestUri) + // Request a Version 2 Schema 1 manifest. The MIME type of a Schema 1 + // manifest is described in the following link: + // https://docs.docker.com/registry/spec/manifest-v2-1/ + // Note: The 'Accept' header is required for Amazon ECR. See: + // https://forums.aws.amazon.com/message.jspa?messageID=780440 + http::Headers manifestHeaders = { + {"Accept", "application/vnd.docker.distribution.manifest.v1+json"} + }; + + return curl(manifestUri, manifestHeaders) .then(defer(self(), &Self::_fetch, uri, directory, manifestUri, + manifestHeaders, lambda::_1)); } @@ -482,13 +493,14 @@ Future<Nothing> DockerFetcherPluginProcess::_fetch( const URI& uri, const string& directory, const URI& manifestUri, + const http::Headers& manifestHeaders, const http::Response& response) { if (response.code == http::Status::UNAUTHORIZED) { return getAuthHeader(manifestUri, response) .then(defer(self(), [=]( const http::Headers& authHeaders) -> Future<Nothing> { - return curl(manifestUri, authHeaders) + return curl(manifestUri, manifestHeaders + authHeaders) .then(defer(self(), &Self::__fetch, uri,
