Stephen Day
ef1c72b978
Merge pull request #805 from RichardScothern/811
...
Spelling corrections
2015-08-04 14:50:32 -07:00
Richard Scothern
78caa1fc93
Merge pull request #817 from aaronlehmann/docker-integration-fixes-2
...
Two more Docker integration test fixes
2015-08-04 13:57:27 -07:00
Aaron Lehmann
a6346d64a1
Two more Docker integration test fixes
...
- Upgrade docker-compose to 1.3.3 to work around
https://github.com/docker/compose/issues/1314
- Change run.sh to run the Docker container in the foreground so that
the exit code is propagated.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-08-04 13:28:03 -07:00
Matt Bentley
1150cfe449
Added information about docker/migrator
...
Signed-off-by: Matt Bentley <matt@docker.com>
2015-08-04 15:22:39 -04:00
Aaron Lehmann
3a414deddb
Merge pull request #514 from denverdino/master
...
Storage Driver for Aliyun OSS
2015-08-04 12:01:02 -07:00
Richard Scothern
2e7ac2ec62
Merge pull request #815 from aaronlehmann/docker-integration-fixes
...
Two fixes for Docker integration tests
2015-08-04 11:56:15 -07:00
Aaron Lehmann
f7a11aa258
Two fixes for Docker integration tests
...
- Add a command line argument to run_multiversion.sh which has it start
a docker daemon. This allows it to run directly inside an outermost
docker-integration container instead of running outside all containers.
- Install Docker 1.7.1 intead of 1.7.0-rc1 in the docker-integration
container. 1.7.0 has a bug that prevents "docker cp" from working
properly.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-08-04 11:49:55 -07:00
Li Yi
d7d34a6c5b
Add the OSS link
...
Change-Id: I940fb50f467ce6fc5fbdd9ceb0f9d848e422ced7
Signed-off-by: Li Yi <denverdino@gmail.com>
2015-08-04 09:18:18 +08:00
Stephen Day
c4e553a655
Merge pull request #814 from aaronlehmann/test-response-writer
...
Make testResponseWriter's CloseNotify return an actual channel instead of nil
2015-08-03 15:59:42 -07:00
Aaron Lehmann
cca86be6bf
Make testResponseWriter's CloseNotify return an actual channel instead of nil
...
This channel never gets written to, but this only means that the mock
ResponseWriter will never signal a premature disconnect.
Based on feedback from #763 .
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-08-03 15:10:14 -07:00
Richard Scothern
12db5fc16b
Merge pull request #783 from aaronlehmann/multiple-version-integration-testing
...
Run integration tests with multiple Docker engine versions
2015-08-03 13:57:52 -07:00
Richard Scothern
db12c889e1
Merge pull request #763 from aaronlehmann/close-notifier
...
Use CloseNotifier to supress spurious HTTP 400 errors on early disconnect
2015-08-03 13:57:32 -07:00
Stephen Day
de7196071b
Merge pull request #803 from duglin/FixBuild
...
Fix vet issue
2015-08-03 12:56:50 -07:00
Doug Davis
633eec0f91
Fix vet issue
...
registry/storage/blob_test.go:149: arg d for printf verb %s of wrong type: github.com/docker/distribution.Descriptor
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-08-03 12:24:34 -07:00
Stephen Day
7a46b772ad
Merge pull request #811 from aaronlehmann/fix-vet
...
Fix go vet in CI
2015-08-03 12:19:55 -07:00
Stephen Day
f9181687f3
Merge pull request #812 from stevvooe/update-s3-dependency
...
Update s3 bindings
2015-08-03 12:05:34 -07:00
Richard Scothern
fb9662ad5a
Add blob delete entry to api description and regenerate api.md
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-08-03 11:59:19 -07:00
Stephen J Day
7fc9e2112a
Update s3 bindings
...
The S3 library has made a few fixes to the retry logic. Updating the bindings
accordingly.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-08-03 11:50:48 -07:00
Aaron Lehmann
5a37b46421
Fix go vet in CI
...
It's necessary to compile the code first; otherwise go vet silently
fails to load imports.
Fixes #807 .
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-08-03 11:29:10 -07:00
Aaron Lehmann
609efa79e4
Set the response code to 499 when a client disconnects during an upload
...
The response code isn't actually sent to the client, because the
connection has already closed by this point. But it causes the status
code to appear as 499 in the logs instead of 0.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-31 17:39:30 -07:00
Aaron Lehmann
9c58954a6e
Factor CloseNotifier use into a new function
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-31 17:30:26 -07:00
Aaron Lehmann
6cb5670ba5
Use CloseNotifier to supress spurious HTTP 400 errors on early disconnect
...
When a client disconnects without completing a HTTP request, we were
attempting to process the partial request, which usually leads to a 400
error. These errors can pollute the logs and make it more difficult to
track down real bugs.
This change uses CloseNotifier to detect disconnects. In combination
with checking Content-Length, we can detect a disconnect before sending
the full payload, and avoid logging a 400 error.
This logic is only applied to PUT, POST, and PATCH endpoints, as these
are the places where disconnects during a request are most likely to
happen.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-31 17:30:26 -07:00
Aaron Lehmann
1788ae4870
Update github.com/gorilla/handlers dependency
...
Support for exposing the CloseNotifier interface was just recently added
to its logging handler wrappers. This is needed for #597 .
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-31 17:30:26 -07:00
Richard Scothern
bffa20d6bb
Spelling corrections
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-07-31 16:43:11 -07:00
Richard Scothern
0b3b55e723
Merge pull request #801 from alexwlchan/master
...
Fix a few typos in the docs
2015-07-31 09:15:35 -07:00
Alex Chan
51bd34eaed
Fix a few typos in the docs
...
Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
2015-07-31 13:36:43 +01:00
tgic
72c794a810
remove unused code and fix todo format
...
Signed-off-by: tgic <farmer1992@gmail.com>
2015-07-31 13:22:56 +08:00
tgic
3eaab7da95
add link to Aliyun OSS doc
...
Signed-off-by: tgic <farmer1992@gmail.com>
2015-07-31 13:22:56 +08:00
tgic
e53d99a837
fix goimports
...
Signed-off-by: tgic <farmer1992@gmail.com>
2015-07-31 13:22:56 +08:00
tgic
806b890cd6
add build tag include_oss to circle.yml
2015-07-31 13:22:56 +08:00
tgic
0058b08eeb
add include_oss build tag
...
Signed-off-by: tgic <farmer1992@gmail.com>
2015-07-31 13:22:56 +08:00
Li Yi
708ad28114
Update the comment for the consistency model
...
Change-Id: Iee49afeda1c11d6af8c0f26c96d8ccc328c22757
Signed-off-by: Li Yi <denverdino@gmail.com>
2015-07-31 13:22:55 +08:00
Li Yi
539c7f5311
Update the comments for consistence model
...
Change-Id: I161522ee51f247fb17e42844b3699bd9031e34e8
Signed-off-by: Li Yi <denverdino@gmail.com>
2015-07-31 13:22:55 +08:00
tgic
76174ad57e
update doc add endpoint
2015-07-31 13:22:55 +08:00
tgic
8e5c901a26
fix testcase TestReadStreamWithOffset incompatible with oss
...
Signed-off-by: tgic <farmer1992@gmail.com>
2015-07-31 13:22:55 +08:00
tgic
2a8535626f
fix oss: got 403 in TestContinueStreamAppendLarge
...
Signed-off-by: tgic <farmer1992@gmail.com>
2015-07-31 13:22:55 +08:00
tgic
9627c6c5a5
godep update oss sdk
...
Signed-off-by: tgic <farmer1992@gmail.com>
2015-07-31 13:22:55 +08:00
Li Yi
813543d6e3
Update the OSS test case for latest code change
...
Signed-off-by: Li Yi <denverdino@gmail.com>
2015-07-31 13:22:55 +08:00
tgic
3a240de22e
check access key and secret before run
2015-07-31 13:22:55 +08:00
tgic
ee9971a5af
update godep
2015-07-31 13:22:54 +08:00
tgic
3d30cb38f6
add endpoint support
2015-07-31 13:22:54 +08:00
Li Yi
38b23c8dff
Update Godeps for Aliyun OSS
...
Signed-off-by: Li Yi <denverdino@gmail.com>
2015-07-31 13:22:54 +08:00
Li Yi
c3b42db014
Add the secure access with HTTPS
...
Signed-off-by: Li Yi <denverdino@gmail.com>
2015-07-31 13:22:54 +08:00
Li Yi
b8a276f2db
Fix the warning of golint
...
Signed-off-by: Li Yi <denverdino@gmail.com>
2015-07-31 13:22:54 +08:00
Li Yi
9e4975d8ff
Support OSS driver
...
Signed-off-by: Li Yi <denverdino@gmail.com>
2015-07-31 13:22:54 +08:00
Stephen Day
7dc8d4a26b
Merge pull request #789 from aaronlehmann/tls-settings
...
Change server TLS config to tighten security
2015-07-30 18:11:53 -07:00
Stephen Day
ba5ab723ad
Merge pull request #792 from stevvooe/uuid-package-improvements
...
UUID package improvements
2015-07-30 18:10:25 -07:00
Stephen Day
4cc4d440f6
Merge pull request #798 from aaronlehmann/example-config-uploadpurging-2
...
Fix earlier commit to enable upload purging in example config file
2015-07-30 17:42:48 -07:00
Aaron Lehmann
a3acd3a0ba
Fix earlier commit to enable upload purging in example config file
...
Rather than setting this to "true", the whole section should be removed.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-30 17:32:35 -07:00
Olivier Gambier
8199962098
Merge pull request #796 from aaronlehmann/example-config-uploadpurging
...
Enable upload purging in example configuration file
2015-07-30 17:20:14 -07:00