Commit graph

1966 commits

Author SHA1 Message Date
Derek McGowan
3207e0c112 Update auth documentation examples to show "expires in" as int
Go will fail to parse the examples since an int is expected rather than a string for the "expires in" value

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-05-25 11:43:36 -07:00
Derek McGowan
0bd7e971b0 Merge pull request #1743 from RichardScothern/tcp-bug
Correct yaml key names in configuration
2016-05-24 11:09:10 -07:00
Richard Scothern
b9d6c7c9fb Merge pull request #1741 from leonhartX/master
fix broken markdown
2016-05-24 11:04:31 -07:00
Richard Scothern
588692f6c4 Correct yaml key names in configuration
Signed-off-by: Richard Scothern <richard.scothern@docker.com>
2016-05-24 10:42:29 -07:00
Richard Scothern
32e9779faf Merge pull request #1734 from legionus/blob-access-controller
Add support for  blobAccessController middleware
2016-05-24 10:34:36 -07:00
Ke Xu
79d6008a54 fix broken markdown
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2016-05-24 16:33:30 +09:00
Aaron Lehmann
5bbf654999 Merge pull request #1725 from jstarks/foreign_layer
Add support for layers from foreign sources
2016-05-20 12:55:55 -07:00
John Starks
f0052b8434 Add support for layers from foreign sources
This will be used to support downloading Windows base layers from
Microsoft URLs.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-05-20 12:31:10 -07:00
Alexey Gladkov
f97eca5ad6 Add support for blobAccessController middleware
Signed-off-by: Michal Minar <miminar@redhat.com>
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
2016-05-19 14:02:15 +02:00
Derek McGowan
4a915d6efd Merge pull request #1721 from cyli/change-auth-scope-grammar
Hostnames can be optionally supported by the auth spec scope grammar
2016-05-11 16:30:28 -07:00
cyli
8854eed7ab Update the auth spec scope grammar to reflect the fact that hostnames are optionally supported.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-11 15:19:50 -07:00
Derek McGowan
e69f108924 Merge pull request #1716 from dmcgowan/install-certs
Integration Tests: Generate the certificate directory with a pretest script
2016-05-10 11:02:59 -07:00
Richard Scothern
050a30eac0 Merge pull request #1702 from RichardScothern/api.md
Remove the unimplemented monolithic upload section from the API
2016-05-10 13:43:25 +01:00
Richard Scothern
42a710f889 Merge pull request #1714 from RichardScothern/us-gov-west-1
Add 'us-gov-west-1' to the valid region list.
2016-05-10 11:44:18 +01:00
Derek McGowan
db713e127b Generate the certificate directory with a pretest script
fixes #1690

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-05-09 14:21:53 -07:00
Richard Scothern
4f2ee029a2 Add 'us-gov-west-1' to the valid region list.
Signed-off-by: Richard Scothern <richard.scothern@docker.com>
2016-05-09 16:38:16 +01:00
Richard Scothern
2a4deee441 Remove the unimplemented monolithic upload section from the API documentation.
Signed-off-by: Richard Scothern <richard.scothern@docker.com>
2016-05-04 15:58:08 -07:00
Olivier Gambier
4ecea4b311 Merge pull request #1663 from moxiegirl/fix-flags
Fixing nginx flag issue identified by customer
2016-05-04 13:52:21 -07:00
Mary Anthony
b0db8d49bd Fixing issue identified by customer
Entering Seb's comment
Fix the flags

Signed-off-by: Mary Anthony <mary@docker.com>
2016-05-04 13:34:23 -07:00
Derek McGowan
48aac6834a Merge pull request #1701 from RichardScothern/updates
Update AUTHORS and version file
2016-05-04 11:04:48 -07:00
Richard Scothern
c1c230dee9 Merge pull request #1626 from RichardScothern/alpine
Use Alpine Linux as the parent image for the registry.
2016-05-04 11:03:42 -07:00
Richard Scothern
35dd23c649 Update AUTHORS and version file
Signed-off-by: Richard Scothern <richard.scothern@docker.com>
2016-05-04 10:22:07 -07:00
Richard Scothern
c047d34b22 Merge pull request #1695 from tonyhb/add-regulator-to-filesystem
Add regulator to filesystem
2016-05-04 10:05:51 -07:00
Richard Scothern
9ec0d742d6 Merge pull request #1696 from runcom/go1.6-lol
registry: do not use http.StatusTooManyRequests
2016-05-04 09:45:18 -07:00
Tony Holdstock-Brown
c9c62380ff Don't wrap thead limits when using a negative int
Signed-off-by: Tony Holdstock-Brown <tony@docker.com>
2016-05-03 16:03:44 -07:00
Antonio Murdaca
f60f275c29 registry: do not use http.StatusTooManyRequests
go1.5 doesn't export http.StatusTooManyRequests while
go1.6 does. Fix this by hardcoding the status code for now.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-03 21:24:45 +02:00
Aaron Lehmann
d4be7016ef Merge pull request #1693 from runcom/too-many-requests
registry: type too many requests error
2016-05-03 10:16:21 -07:00
Antonio Murdaca
a264f9ae29 registry: type too many requests error
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-03 18:41:54 +02:00
Tony Holdstock-Brown
d0352a7448 Add documentation
Signed-off-by: Tony Holdstock-Brown <tony@docker.com>
2016-05-03 09:33:25 -07:00
Tony Holdstock-Brown
33c448f147 Implement regulator in filesystem driver
This commit refactors base.regulator into the 2.4 interfaces and adds a
filesystem configuration option `maxthreads` to configure the regulator.

By default `maxthreads` is set to 100. This means the FS driver is
limited to 100 concurrent blocking file operations. Any subsequent
operations will block in Go until previous filesystem operations
complete.

This ensures that the registry can never open thousands of simultaneous
threads from os filesystem operations.

Note that `maxthreads` can never be less than 25.

Add test case covering parsable string maxthreads

Signed-off-by: Tony Holdstock-Brown <tony@docker.com>
2016-05-03 09:33:22 -07:00
Sven Dowideit
b7088d29c6 Merge pull request #1680 from SvenDowideit/use-docs-base-oss
convert docs Dockerfiles to use docs/base:oss
2016-05-03 10:48:11 +10:00
Richard Scothern
5d08dfa70c Merge pull request #1650 from majewsky/swift/wait-for-dlo-segments
[Swift] wait for DLO segments to show up when Close()ing the writer
2016-05-02 13:41:26 -07:00
Derek McGowan
a1d7463d67 Merge pull request #1669 from RichardScothern/close-after-commit
Clean uploads
2016-04-29 16:18:29 -07:00
Aaron Lehmann
024a9ed6c7 Merge pull request #1681 from aaronlehmann/preserve-authors-schema1
Preserve author information in schema1 manifests
2016-04-29 14:40:24 -07:00
Derek McGowan
72c9bfe1b5 Merge pull request #1683 from dmcgowan/update-golem-test-versions
Use official docker 1.11.1 image to test docker 1.11
2016-04-29 09:54:28 -07:00
Derek McGowan
8cded9db0d Use official docker 1.11.1 image to test docker 1.11
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-04-28 14:51:13 -07:00
Richard Scothern
ba927007b0 Merge pull request #1677 from RichardScothern/tonyhb-fix-s3-gc-error
Move GC into storage package and add tests
2016-04-28 14:09:58 -07:00
Aaron Lehmann
620a030217 Preserve author information in schema1 manifests
When we push a schema1 manifest, we encode history information from the
image JSON into v1Compatibility strings for the respective layers. The
"author" field was not being set in these v1Compatibility strings, so if
a parent layer had an author set, it would not be preserved after
pushing through a schema1 manifest and repulling, so the image ID would
change after the pull. This change preserves the authorship information
for parent layers so that the image ID does not change.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-04-28 11:57:48 -07:00
Sven Dowideit
e728c8bbed convert docs Dockerfiles to use docs/base:oss
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-04-28 12:57:10 +00:00
Richard Scothern
a7dda2ce93 Merge pull request #1665 from andrewhsu/middleware-redirect
add middleware storage driver for redirect
2016-04-27 15:05:52 -07:00
Richard Scothern
d2e29acce0 When a blob upload is committed prevent writing out hashstate in the
subsequent close.

When a blob upload is cancelled close the blobwriter before removing
upload state to ensure old hashstates don't persist.

Signed-off-by: Richard Scothern <richard.scothern@docker.com>
2016-04-27 14:42:00 -07:00
Richard Scothern
69ba30dc03 Add a test with a missing _manifests directory
Signed-off-by: Richard Scothern <richard.scothern@docker.com>
2016-04-27 13:34:25 -07:00
Richard Scothern
ea492aca1a Move garbage collect code into storage package
Signed-off-by: Richard Scothern <richard.scothern@docker.com>
2016-04-27 13:34:25 -07:00
Tony Holdstock-Brown
a5aaae1f06 Ensure GC continues marking if _manifests is nonexistent
Signed-off-by: Tony Holdstock-Brown <tony@docker.com>
2016-04-27 13:33:36 -07:00
Richard Scothern
6a992e1348 Merge pull request #1675 from sergeyfd/master
Fix wording for dry-run flag in usage message for garbage collector.
2016-04-27 10:08:53 -07:00
Serge Dubrouski
32193bdcf0 Fix wording for dry-run flag in useage message for garbage collector.
Signed-off-by: Serge Dubrouski <sergeyfd@gmail.com>
2016-04-26 19:44:23 -06:00
Josh Hawn
e4dd3359cc Regulate filesystem driver to max of 100 calls
It's easily possible for a flood of requests to trigger thousands of
concurrent file accesses on the storage driver. Each file I/O call creates
a new OS thread that is not reaped by the Golang runtime. By limiting it
to only 100 at a time we can effectively bound the number of OS threads
in use by the storage driver.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

Signed-off-by: Tony Holdstock-Brown <tony@docker.com>
2016-04-26 14:44:13 -07:00
Andrew Hsu
09a9b0cf90 separate the go/non-go imports and reorder
Signed-off-by: Andrew Hsu <andrewhsu@acm.org> (github: andrewhsu)
2016-04-26 14:33:54 -07:00
Richard Scothern
47d14555c0 Merge pull request #1644 from fh1ch/clarify-kid-format
Clarify kid format for JWT token auth in docs
2016-04-25 17:01:15 -07:00
Richard Scothern
d654cfd985 Merge pull request #1623 from dmcgowan/docker-integration-readme
Integration test readme update
2016-04-25 16:10:19 -07:00