Aaron Lehmann
f9a3f028b5
Fix content type for schema1 signed manifests
...
The Payload function for schema1 currently returns a signed manifest,
but indicates the content type is that of a manifest that isn't signed.
Note that this breaks compatibility with Registry 2.3 alpha 1 and
Docker 1.10-rc1, because they use the incorrect content type.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-18 16:08:02 -08:00
Richard Scothern
0640813179
Merge pull request #1363 from aaronlehmann/media-type-charset
...
Do not require "charset=utf-8" for a schema1 with content type application/json
2016-01-18 15:20:01 -08:00
Richard Scothern
b2876674f3
Merge pull request #1355 from hopkings2008/master
...
In testsuites.go, enlarge the size of randomBytes to 128M to fix the …
2016-01-18 12:38:26 -08:00
Richard Scothern
f4bd6cacd1
Merge pull request #1357 from aibaars/gcs-test
...
StorageDriver GCS test suite: try google.DefaultTokenSource first
2016-01-18 11:29:01 -08:00
Aaron Lehmann
3da0ee00d8
Do not require "charset=utf-8" for a schema1 with content type application/json
...
For compatibility with other registries that don't use this exact
variant of the Content-Type header, we need to be more flexible about
what we accept. Any form of "application/json" should be allowed. The
charset should not be included in the comparison.
See docker/docker#19400 .
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-18 09:59:50 -08:00
Daniel Nephin
6e85a8d94a
Remove the use of dockerversion from the registry package
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-15 12:43:54 -05:00
Arthur Baars
985c0d602f
StorageDriver GCS: try google.DefaultTokenSource first
...
Signed-off-by: Arthur Baars <arthur@semmle.com>
2016-01-15 11:47:47 +00:00
yuzou
d3d9282a30
In testsuites.go, enlarge the size of randomBytes to 128M to fix the crash of running TestConcurrentStreamReads
...
Signed-off-by: yuzou <zouyu7@huawei.com>
2016-01-15 17:22:43 +08:00
Richard Scothern
05dc6404fd
Merge pull request #1332 from RichardScothern/gcs-params
...
Change the parameters to the GCS drivers to allow CircleCI testing.
2016-01-14 15:50:09 -08:00
Brian Bland
67aef89bc0
Splits up blob create options definitions to be package-specific
...
Redefines privately in both storage and client packages
Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-14 10:47:33 -08:00
Brian Bland
e90578b27d
Merge pull request #1348 from BrianBland/fixCrossRepoBlobMount
...
Fixes cross-repo blob mounting in the BlobUploadHandler
2016-01-14 09:44:30 -08:00
Brian Bland
e0d4a45c93
Fixes cross-repo blob mounting in the BlobUploadHandler
...
Accidentally checked for err != nil instead of err == nil :/
Also now ensures that only a non-nil option is appended to the create
options slice
Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-13 19:21:45 -08:00
Richard Scothern
5d35fa34c1
Change the parameters to the GCS drivers to allow CircleCI testing.
...
Remove the requirement of file system access to run GCS unit tests. Deconstruct
the input parameters to take the private key and email which can be specified on
the build system via environment variables.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2016-01-13 18:00:59 -08:00
Richard Scothern
b38b9ba385
Merge pull request #1344 from BrianBland/blobCreateWithOptions
...
Adds functional options arguments to the Blobs Create method, remove Mount operation
2016-01-13 17:35:49 -08:00
Brian Bland
36023174db
Adds functional options arguments to the Blobs Create method
...
Removes the Mount operation and instead implements this behavior as part
of Create a From option is provided, which in turn returns a rich
ErrBlobMounted indicating that a blob upload session was not initiated,
but instead the blob was mounted from another repository
Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-13 16:42:59 -08:00
Richard Scothern
66b492e69f
Merge pull request #1335 from RichardScothern/fix-build
...
Fix manifest API unit tests
2016-01-11 14:17:36 -08:00
Richard Scothern
93b65847ca
Fix manifest API unit tests
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2016-01-11 12:52:21 -08:00
Richard Scothern
b7aee20b81
Merge pull request #1319 from RichardScothern/update-tags
...
Remove tags referencing deleted manifests.
2016-01-11 11:33:22 -08:00
Richard Scothern
5fe3d68e9c
Merge pull request #1269 from BrianBland/crossRepositoryPush
...
Adds cross-repository blob mounting behavior
2016-01-08 14:37:00 -08:00
Brian Bland
44d95e5841
Allows token authentication handler to request additional scopes
...
When an auth request provides the "from" query parameter, the token
handler will add a "pull" scope for the provided repository, refreshing
the token if the overall scope has increased
Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-08 13:53:23 -08:00
Brian Bland
41e30f626b
Adds cross-repository blob mounting behavior
...
Extends blob upload POST endpoint to support mount and from query
parameters as described in #634
Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-08 13:53:18 -08:00
Richard Scothern
e5e0e2cc2a
Merge pull request #1276 from denverdino/oss-test
...
Support large layer for OSS driver
2016-01-08 13:26:09 -08:00
Stephen Day
c426367881
Merge pull request #1281 from aaronlehmann/new-manifest
...
Implement schema2 manifest formats
2016-01-07 17:19:56 -08:00
Stephen Day
98fecde1c9
Merge pull request #911 from stevvooe/consistent-error-string
...
More consistent return from ErrorCode.Error()
2016-01-07 17:06:12 -08:00
Aaron Lehmann
bbabb55ccb
Move MediaType into manifest.Versioned
...
This makes content type sniffing cleaner. The document just needs to be
decoded into a manifest.Versioned structure. It's no longer a two-step
process.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-07 15:26:27 -08:00
Aaron Lehmann
fce65b72b3
Recognize clients that don't support manifest lists
...
Convert a default platform's manifest to schema1 on the fly.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-07 15:26:27 -08:00
Aaron Lehmann
7ef71988a8
Add support for manifest list ("fat manifest")
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-07 15:26:27 -08:00
Aaron Lehmann
66a33baa36
Add API unit testing for schema2 manifest
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-07 15:26:26 -08:00
Aaron Lehmann
f14c6a4814
Recognize clients that don't support schema2, and convert manifests to schema1 on the fly
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-07 15:26:26 -08:00
Aaron Lehmann
9c13a8295f
Factor out schema-specific portions of manifestStore
...
Create signedManifestHandler and schema2ManifestHandler. Use these to
unmarshal and put the respective types of manifests from manifestStore.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-07 15:26:26 -08:00
David Calavera
981a573eaf
Modify import paths to point to the new engine-api package.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-06 19:48:59 -05:00
Richard Scothern
6a248e115b
Merge pull request #1321 from aibaars/gcs-fix-retry
...
GCS storage driver: fix retry function
2016-01-06 12:00:12 -08:00
Richard Scothern
e28a924e0c
Merge pull request #1323 from aibaars/gcs-fix-list-empty
...
GCS Storagedriver: fix test failure caused by #1187
2016-01-06 11:18:34 -08:00
Arthur Baars
5c6fdc710f
GCS Storagedriver: fix test failure caused by #1187
...
Signed-off-by: Arthur Baars <arthur@semmle.com>
2016-01-06 18:36:28 +00:00
Arthur Baars
bf1e41a9f2
GCS driver: fix retry function
...
Signed-off-by: Arthur Baars <arthur@semmle.com>
2016-01-06 17:57:22 +00:00
Richard Scothern
fea0a7ed49
Remove tags referencing deleted manifests.
...
When a manifest is deleted by digest, look up the referenced tags in the tag
store and remove all associations.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2016-01-05 13:47:52 -08:00
Phil Estes
062d6cd782
Merge pull request #18889 from aaronlehmann/v1-fallback-pull-all-tags
...
Allow v1 protocol fallback when pulling all tags from a repository unknown to v2 registry
2016-01-05 16:20:04 -05:00
Stephen Day
5529baa918
Merge pull request #1249 from k4leung4/print-error-msg
...
Print error for failed HTTP auth request.
2016-01-05 12:23:05 -08:00
Richard Scothern
72432a701a
Show the legacy registry flag only in the daemon arguments
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2016-01-04 14:52:39 -08:00
Stephen Day
1c6c0c8a2d
Merge pull request #1097 from hopkings2008/master
...
use the scheme and host from x-forward-proto and x-forward-host if the…
2015-12-30 16:35:20 -08:00
Brian Goff
f2158e3920
Merge pull request #18981 from calavera/stop_using_sockets_package
...
Remove pkg sockets and tlsconfig.
2015-12-29 22:22:11 -05:00
Stephen Day
e4d08a35ca
Merge pull request #1304 from BrianBland/fsDriverRelaxedPermissions
...
Relaxes filesystem driver permissions to 0777 (dirs) and 0666 (files)
2015-12-29 19:06:45 -08:00
David Calavera
4f4b3d5257
Remove usage of pkg sockets and tlsconfig.
...
- Use the ones provided by docker/go-connections, they are a drop in replacement.
- Remove pkg/sockets from docker.
- Keep pkg/tlsconfig because libnetwork still needs it and there is a
circular dependency issue.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-29 19:27:12 -05:00
Kenny Leung
731befec93
Merge branch 'print-error-msg' of https://github.com/k4leung4/distribution into print-error-msg
...
Changed to use typed error instead of formatted string.
Added tests for new public method.
Signed-off-by: Kenny Leung <kleung@google.com>
2015-12-29 16:26:13 -08:00
Brian Bland
2394deaedc
Merge pull request #1303 from BrianBland/fixDisabledStorageRedirects
...
Serve blobs when a storage driver supports redirects but are disabled
2015-12-29 13:28:45 -08:00
Kenny Leung
b89c4e8cbf
Print error for failed HTTP auth request.
...
Signed-off-by: Kenny Leung <kleung@google.com>
2015-12-29 11:39:20 -08:00
weiyuan.yl
5dc714b347
Replace 404 to http.StatusNotFound
...
Change-Id: Ia100975cb93c0a6d94ea5542b1c9ce386bc87649
Signed-off-by: weiyuan.yl <weiyuan.yl@alibaba-inc.com>
2015-12-29 12:09:04 +08:00
Brian Bland
165507a622
Relaxes filesystem driver permissions to 0777 (dirs) and 0666 (files)
...
Leaves any further permissions restrictions to the process umask
Signed-off-by: Brian Bland <brian.bland@docker.com>
2015-12-28 15:22:28 -08:00
Brian Bland
cf4fdc1be0
Serve blobs when a storage driver supports redirects but are disabled
...
Fixes issue where an error was returned instead of serving the blob
Signed-off-by: Brian Bland <brian.bland@docker.com>
2015-12-28 11:08:39 -08:00
yuzou
9c7dc47d80
use the scheme and host from x-forward-proto and x-forward-host if they exits and correct the scheme for Location header during image upload
...
Signed-off-by: yuzou <zouyu7@huawei.com>
2015-12-28 17:28:32 +08:00