Commit graph

762 commits

Author SHA1 Message Date
Stephen Day
34bc659a79 Merge pull request #449 from moxiegirl/update-env-config
Updating env var documentation
2015-04-27 16:01:15 -07:00
Mary Anthony
5043bdbc93 Updating env var documentation
The position was a bit too early. Fleshed out the example.
Also, using the _ underscore for emphasis was confusing because it is also used to indicate
a level change.

Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-27 15:49:19 -07:00
Olivier Gambier
fab7e7f2c2 Merge pull request #446 from moxiegirl/update-per-397
Updating configuration with required header
2015-04-27 15:14:11 -07:00
Mary Anthony
8ae13b4725 Updating configuration with required header
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-27 14:46:33 -07:00
Stephen Day
70427e3d9f Merge pull request #381 from RichardScothern/purge-config
Add configuration for upload purging
2015-04-27 14:33:34 -07:00
Stephen Day
a9f93d6157 Merge pull request #439 from xiekeyang/superfluous-embedded-name
simplify the embedded method expression of repository
2015-04-27 14:31:26 -07:00
Stephen Day
8ea689e17a Merge pull request #423 from hgomez/master
Apache HTTPd sample configuration
2015-04-27 13:49:05 -07:00
Stephen Day
7ba2bdb7dc Merge pull request #444 from RichardScothern/docs
Add registry configuration environment variable documentation
2015-04-27 13:41:11 -07:00
Stephen Day
734167b4dc Merge pull request #445 from moxiegirl/fix-storage-driver-links
Pushing fix for mkdocs.yml introduced
2015-04-27 12:07:04 -07:00
Mary Anthony
d5c0300986 Pushing fix for mkdocs.yml introduced
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-27 11:27:49 -07:00
Richard
937c356585 Add environment variable override instructions
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-04-27 11:23:37 -07:00
Richard
6460ddb2cb Add configuration for upload purging
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-04-27 11:06:15 -07:00
Henri Gomez
7df490b6b2 Create README.MD
Signed-off-by: Henri Gomez <henri.gomez@gmail.com>
2015-04-27 13:00:48 +02:00
Henri Gomez
f3e08f8721 Update apache.conf
Signed-off-by: Henri Gomez <henri.gomez@gmail.com>
2015-04-27 13:00:41 +02:00
Henri Gomez
66a9e12f99 remove apache.conf from contrib dir
Signed-off-by: Henri Gomez <henri.gomez@gmail.com>
2015-04-27 13:00:39 +02:00
Henri Gomez
9e4db7bbd3 move apache.conf to apache subdir
Signed-off-by: Henri Gomez <henri.gomez@gmail.com>
2015-04-27 13:00:37 +02:00
Henri Gomez
3e0e1b1d82 Correct documentation
Signed-off-by: Henri Gomez <henri.gomez@gmail.com>
2015-04-27 13:00:35 +02:00
Henri Gomez
c8aca239b1 describe 3 registry containers
Signed-off-by: Henri Gomez <henri.gomez@gmail.com>
2015-04-27 13:00:27 +02:00
xiekeyang
c89e517be1 simplify the embedded method expression of repository
Signed-off-by: xiekeyang <xiekeyang@huawei.com>
2015-04-27 16:33:58 +08:00
Stephen Day
4dde6b9d64 Merge pull request #435 from jlhawn/fix_maybe_431
Updated urlbuilder X-Forwarded-Host logic
2015-04-24 15:25:19 -07:00
Josh Hawn
628c7fa77b Updated urlbuilder X-Forwarded-Host logic
According to the Apache mod_proxy docs, X-Forwarded-Host can be a
comma-separated list of hosts, to which each proxy appends the requested
host. We want to grab only the first from this comma-separated list
to get the original requested Host when building URLs.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-04-24 14:16:49 -07:00
Olivier Gambier
8da7bcbec9 Merge pull request #396 from bobrik/patch-1
Fixed links for storage drivers
2015-04-24 13:43:04 -07:00
Ian Babrou
824e7e8ae2 docs: fixed links for storage drivers
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
2015-04-24 21:57:09 +03:00
Olivier Gambier
9b6d49fdb0 Merge pull request #430 from stevvooe/address-s3-timeout-error
Attempt to address intermittent s3 RequestTimeout error
2015-04-24 11:20:30 -07:00
Stephen Day
528869ac03 Merge pull request #420 from stevvooe/expose-drivernames
Expose storage driver names for tracing
2015-04-24 10:53:40 -07:00
Henri Gomez
3e4e081c1d Sample Apache 2.x configuration, mirror, registry v1+registry v2
Signed-off-by: Henri Gomez <henri.gomez@gmail.com>
2015-04-24 09:55:14 +02:00
Stephen J Day
e6715c5cec Attempt to address intermittent s3 RequestTimeout error
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-23 20:07:32 -07:00
Olivier Gambier
c20417ce68 Merge pull request #429 from stevvooe/correct-chunksize-check
Correctly check s3 chunksize parameter
2015-04-23 17:02:27 -07:00
Stephen J Day
6dd27cd2cb Correctly check s3 chunksize parameter
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-23 16:31:41 -07:00
Olivier Gambier
f40bf864b0 Merge pull request #428 from stevvooe/return-after-error
Return after error in handler
2015-04-23 14:01:25 -07:00
Stephen J Day
f6d75a6139 Return after error in handler
This adds a missing return statement. It is not strictly needed since if the
io.Copy fails, the Finish operation will fail. Currently, the client reports
both errors where this new code will correctly only report the io.Copy error.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-23 13:13:13 -07:00
Stephen J Day
d7eb17fd72 Include driver name in trace messsages
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-22 17:30:31 -07:00
Stephen J Day
9e146437e4 Require storage drivers to report their name
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-22 17:30:01 -07:00
Stephen Day
73960f4024 Merge pull request #419 from stevvooe/pool-buffers-s3
Pool buffers used in S3.WriteStream
2015-04-22 16:41:28 -07:00
Stephen J Day
1adab029f6 Pool buffers used in S3.WriteStream
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-22 16:25:53 -07:00
Olivier Gambier
506a5b4a97 Merge pull request #418 from stevvooe/accept-chunksize-parameter
Allow configuration of chunksize parameter
2015-04-22 14:46:40 -07:00
Stephen J Day
72a702d0d9 Allow configuration of chunksize parameter
The code using values from the yaml package wasn't careful enought with the
possible incoming types. Turns out, it is just an int but we've made this
section somewhat bulletproof in case that package changes the behavior.

This code likely never worked. The configuration system should be decoupled
from the object instantiation.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-22 14:31:34 -07:00
Stephen Day
cc1bd58d0f Merge pull request #416 from stevvooe/remove-go13-test
Disable go1.3 tests for circle and upgrade to go1.4.2
2015-04-22 13:28:36 -07:00
Stephen Day
cbfce39acb Merge pull request #415 from stevvooe/update-goamz
Update goamz package dependency
2015-04-22 13:06:46 -07:00
Stephen J Day
36093aaf8b Disable go1.3 tests for circle and upgrade to go1.4.2
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-22 12:57:22 -07:00
Stephen Day
e59046e598 Merge pull request #414 from stevvooe/check-error-copy
Check error returned from io.Copy
2015-04-22 12:46:55 -07:00
Stephen J Day
4330627c71 Check error returned from io.Copy
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-22 12:35:08 -07:00
Stephen J Day
9bd1186654 Update goamz package dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-22 12:32:59 -07:00
Stephen Day
aa09c6c262 Merge pull request #408 from stevvooe/increase-retry-backoff
Backoff retry on verification to give s3 time to propagate
2015-04-21 13:19:28 -07:00
Stephen J Day
632e46418b Backoff retry on verification to give s3 time to propagate
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-21 13:04:46 -07:00
Stephen Day
ad69b9d984 Merge pull request #407 from stevvooe/log-canonical-digest
log canonical digest on verification error
2015-04-21 13:03:32 -07:00
Stephen J Day
d8dbcc3efa log canonical digest on verification error
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-21 11:34:18 -07:00
Olivier Gambier
1b975e980b Merge pull request #405 from stevvooe/eventual-consistency
Attempt to deal with eventual consistency by retrying
2015-04-20 18:59:01 -07:00
Stephen Day
70e6ad6ef1 Merge pull request #404 from RichardScothern/digest-log
Add logging for generic handler errors.
2015-04-20 18:51:59 -07:00
Stephen J Day
c8345090d9 Attempt to deal with eventual consistency by retrying
Rather than accept the resulting of a layer validation, we retry up to three
times, backing off 100ms after each try. The thought is that we allow s3 files
to make their way into the correct location increasing the liklihood the
verification can proceed, if possible.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-04-20 18:49:22 -07:00