Stephen Day
e266c684d0
Merge pull request #671 from RichardScothern/false-err
...
Prevent the ErrUnsupportedMethod error from being returned up the stack.
2015-06-29 16:53:40 -07:00
Richard Scothern
0edb91185b
Prevent the ErrUnsupportedMethod error from being returned up the stack.
...
It eventually causes the go http library to do a double WriteHeader()
which is an error
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-06-29 16:44:09 -07:00
Olivier Gambier
702d9ddcbc
Merge pull request #668 from stevvooe/update-authors
...
Update AUTHORS file
2015-06-27 14:51:47 +02:00
Stephen J Day
b616f3f455
Update AUTHORS file
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-06-26 17:27:19 -07:00
Stephen Day
3830c87469
Merge pull request #666 from docker/revert-661-add-authentication
...
Revert "Updates to authentication"
2015-06-26 14:22:26 -07:00
Stephen Day
eec0e998af
Revert "Updates to authentication"
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-06-26 14:21:57 -07:00
Stephen Day
5ed143bc06
Merge pull request #659 from vdemeester/specs-api-table-fix
...
Fix table render in specs/api.md
2015-06-26 10:17:35 -07:00
moxiegirl
16a63c8b78
Merge pull request #661 from moxiegirl/add-authentication
...
Updates to authentication
2015-06-26 03:22:34 -07:00
Mary Anthony
9510ef3637
Updates to authentication
...
Fixing heading not rendering
Fixing bad links:
deployed.md > deploying.md
spec/auth/token.md > /spec/auth/token.md
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-26 03:08:26 -07:00
Vincent Demeester
536e2fccf9
Fix table render in specs/api.md
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-06-26 10:34:48 +02:00
Stephen Day
763eefee55
Merge pull request #660 from moxiegirl/add-authentication
...
Adding metadata files
2015-06-25 18:02:44 -07:00
Mary Anthony
eec3ca02ba
Adding metadata files
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-25 17:32:57 -07:00
Stephen Day
b6faf3fa9f
Merge pull request #645 from RichardScothern/manifest-cache-headers
...
Cache headers for manifests.
2015-06-25 13:20:39 -07:00
Stephen Day
d0fda14e85
Merge pull request #570 from dmcgowan/docker-integration
...
contrib: Docker integration tests
2015-06-19 12:49:27 -07:00
Richard Scothern
1bc740b0d5
Add Etag header for manifests.
...
Return 304 (Not Modified) if retrieved with If-None-Match header
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-06-19 10:44:21 -07:00
Stephen Day
851d3c3459
Merge pull request #647 from duglin/BlobTestFix
...
Add 'message' back to BlobTest sample json
2015-06-18 18:51:47 -07:00
Doug Davis
7bb98181ab
Add 'message' back to BlobTest sample json
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-06-18 18:24:54 -07:00
Stephen Day
7549a2cca4
Merge pull request #646 from duglin/revertErrorsJSON
...
Add back in the "errors" wrapper in the Errors serialization
2015-06-18 18:17:21 -07:00
Doug Davis
cb45ec56ff
Add back in the "errors" wrapper in the Errors serialization
...
See: https://github.com/docker/distribution/pull/548/files#r32794064
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-06-18 18:00:26 -07:00
Stephen Day
d2ca423500
Merge pull request #638 from duglin/MoveHTTPRC
...
Move challenge http status code logic
2015-06-18 12:03:29 -07:00
Stephen Day
0f01b997c7
Merge pull request #642 from dmp42/2.fixdocs
...
Fixed doc generation
2015-06-17 19:02:01 -07:00
Olivier Gambier
4e95367e55
Fixed doc generation
...
+ rollback the (now) unecessary changes
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-06-17 18:58:53 -07:00
Stephen Day
f89e584aa5
Merge pull request #637 from stevvooe/fix-build-without-rados
...
Ensure that rados is disabled without build tag
2015-06-17 18:38:27 -07:00
Doug Davis
c4eb195cc1
Move challenge http status code logic
...
See: 3ea67df373/registry/handlers/app.go (L498)
Per the comment on line 498, this moves the logic of setting the http
status code into the serveJSON func, leaving the auth.Challenge.ServeHTTP()
func to just set the auth challenge header.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-06-17 18:23:55 -07:00
Olivier Gambier
b5977c0868
Merge pull request #641 from moxiegirl/hugo-test-fixes
...
Hugo final 1.7 Documentation PR -- please read carefully
2015-06-17 18:04:53 -07:00
Mary Anthony
1aa8b00bdf
Adding in the better sed
...
Renaming to index.md;rereading of Hugo showed me my mistake; removing commented out/Markdown has no comment feature
Updating with Olivier. Yay! It looks great
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-17 17:31:13 -07:00
Stephen J Day
b65a4a8713
Ensure that rados is disabled without build tag
...
This ensures that rados is not required when building the registry. This was
slightly tricky in that when the flags were applied, the rados package was
completely missing. This led to a problem where rados was basically unlistable
and untestable as a package. This was fixed by simply adding a doc.go file that
is included whether rados is built or not.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-06-16 20:00:02 -07:00
Stephen Day
3ea67df373
Merge pull request #623 from ahmetalpbalkan/azure-vendor
...
storage/driver/azure: Update vendored Azure SDK
2015-06-16 17:41:38 -07:00
Ahmet Alp Balkan
daa22cacba
storage/driver/azure: Update vendored Azure SDK
...
This change refreshes the updated version of Azure SDK
for Go that has the latest changes.
I manually vendored the new SDK (github.com/Azure/azure-sdk-for-go)
and I removed `management/` `core/` packages manually simply because
they're not used here and they have a fork of `net/http` and `crypto/tls`
for a particular reason. It was introducing a 44k SLOC change otherwise...
This also undoes the `include_azure` flag (actually Steven removed the
driver from imports but forgot to add the build flag apparently, so the
flag wasn't really including azure. 😄 ). This also must be obsolete
now.
Fixes #620 , #175 .
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-06-16 17:13:44 -07:00
Stephen Day
25f9e314d2
Merge pull request #636 from stevvooe/uuid-generate-detect-eperm
...
Correctly detect EPERM on crypto/rand.Random.Read failure
2015-06-16 16:39:18 -07:00
Stephen Day
939b199154
Merge pull request #616 from RichardScothern/debug_build
...
Enable the registry to be built with debug symbols
2015-06-16 16:19:15 -07:00
Stephen J Day
7e35d16cb6
Correctly detect EPERM on crypto/rand.Random.Read failure
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-06-16 13:06:58 -07:00
moxiegirl
020bd0b45f
Merge pull request #631 from moxiegirl/test-tooling
...
Updating for new docs build and tooling infrastructure 1.7 release; Thank you Olivier. I promise to look at all of this after Dockercon. We'll make it perfect.
2015-06-15 17:57:25 -07:00
Olivier Gambier
d678e3dc57
Merge pull request #608 from dmcgowan/http-basic-auth
...
Implementation of a basic authentication scheme using standard .htpasswd
2015-06-15 17:40:58 -07:00
Mary Anthony
832cb9d52c
Updating for Hugo
...
Updating for tooling tests
Updating with the new sed scripts to protect links
updating with new image
Updating with comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-15 14:39:33 -07:00
Stephen Day
e57e731821
Merge pull request #548 from duglin/MoveErrors
...
Move ErrorCode logic to new errcode package
2015-06-15 14:33:28 -07:00
Olivier Gambier
fc09e50eb4
Merge pull request #626 from dmp42/0.htpasswd
...
Ship htpasswd
2015-06-11 23:42:15 -07:00
Olivier Gambier
844dd6b0a5
Ship htpasswd
...
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-06-11 22:11:26 -07:00
Doug Davis
441f7cac87
Round 4
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-06-11 21:33:35 -07:00
Stephen Day
4dc0c5e0c5
Merge pull request #624 from hopkings2008/master
...
add configuration file close after it is parsed.
2015-06-11 20:07:12 -07:00
yuzou
8a89040247
add configuration file close after it is parsed.
...
Signed-off-by: yuzou <zouyu7@huawei.com>
2015-06-12 10:41:00 +08:00
Richard
17db4d9e11
Enable the registry to be built with debug information with an environment
...
variable 'DISABLE_OPTIMIZATION'.
$ DISABLE_OPTIMIZATION=true make binaries
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-06-11 17:22:08 -07:00
Stephen J Day
d9d55bcbab
Minor formatting fixes related to htpasswd auth
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-06-11 17:06:35 -07:00
Olivier Gambier
9b75807a0b
Merge pull request #622 from amouat/patch-2
...
Fix service command
2015-06-11 15:27:43 -07:00
Stephen J Day
01f730ad71
Document usage of htpasswd access controller
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-06-11 15:23:40 -07:00
Stephen Day
30d698926e
Merge pull request #621 from amouat/patch-1
...
Fix typo
2015-06-11 15:17:53 -07:00
Adrian Mouat
a0baf93725
Fix service command
...
Pretty sure that service and docker were the wrong way around
Signed-off-by: Adrian Mouat <adrian.mouat@gmail.com>
2015-06-11 22:36:31 +01:00
Adrian Mouat
f670f00058
Fix typo
...
I think negociate is very occasionally used, but it certainly looks wrong to me.
Signed-off-by: Adrian Mouat <adrian.mouat@gmail.com>
2015-06-11 21:45:26 +01:00
Olivier Gambier
6deedd29d9
Merge pull request #615 from allingeek/master
...
Adding a volume for the default 'registry-dev' location.
2015-06-11 12:51:36 -07:00
Stephen Day
a5b21fa8f0
Merge pull request #617 from dmp42/pathchange
...
Saner default data location
2015-06-11 11:42:24 -07:00