Alexander Morozov
3b0a166b10
Merge pull request #22478 from Microsoft/jjh/clirunsleepingcontainer
...
runSleepingContainer consistency
2016-05-03 13:11:27 -07:00
Daniel Nephin
3bf75b7330
Merge pull request #3398 from shin-/docker-py-1.8.1
...
Require latest docker-py version
2016-05-03 15:47:47 -04: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
Anuj Bahuguna
fd8a6775f5
Adding Rita Levi-Montalcini and Claude Shannon to name generator
...
Signed-off-by: Anuj Bahuguna "anujbahuguna.dev@gmail.com "
Signed-off-by: Anuj Bahuguna <abahuguna@fiberlink.com >
2016-05-04 00:14:09 +05:30
John Howard
481cc6716f
RunSleepingContainer consistency
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-05-03 11:39:29 -07:00
French Ben
35b3b2aa81
Merge pull request #1651 from SvenDowideit/use-docs-base-oss
...
convert docs Dockerfiles to use docs/base:oss
2016-05-03 14:18:57 -04:00
John Howard
94f1e574b6
Reduce time for TestRunTwoConcurrentContainers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-05-03 10:55:20 -07:00
Sebastiaan van Stijn
61d265964f
Merge pull request #22468 from thaJeztah/fix-dotcloud-link
...
Fix dotCloud link
2016-05-03 19:30:13 +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
Tomasz Kopczynski
ab2baf08f0
Builder unit tests refactoring
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
2016-05-03 19:00:35 +02:00
michael.freund
0ccc958b50
Filter for containerslots-label
...
Signed-off-by: michael.freund <michael.freund@shopgate.com >
2016-05-03 09:54:51 -07:00
Alexander Morozov
73a8b6e3aa
Merge pull request #22441 from tkopczynski/20784-builder-remote-tests
...
Unit test for builder/remote.go
2016-05-03 09:51:19 -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
Sun Hongliang
50be8f4802
use --cpu-shares instead of -c in integration test
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io >
2016-05-04 00:12:58 +08:00
Vincent Demeester
9837ec4da5
Merge pull request #22461 from tonistiigi/fix-implicit-pull-test-arm
...
Move implicit pull test to use local registry
2016-05-03 11:56:29 +02:00
Sebastiaan van Stijn
f2fd765450
Fix dotCloud link
...
dotCloud no longer exists, and since this part of the
readme is refering to "where it all started", replaced
the link with an archive link around the time that
Docker was publicly announced.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-05-03 11:43:43 +02:00
Tomasz Kopczynski
e00ad7227e
Unit test for builder/remote.go
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
2016-05-03 10:20:10 +02:00
Yong Tang
4b5404f15e
Docker inspect gave default log options even when the option is emtpy.
...
This fix tries to addess the issue in #21956 where `docker inspect`
will overwrite the log config options with default option even when
the `--log-driver` is not empty and `--log-opt` is empty. In this
situation, `docker inspect` and `docker run` is different.
With the introduction of #21153 , the `HostConfig` will always have
the correct log-driver and log-opt values.
However, the previous processing of `docker inspect` was not updated
after the change in #21153 . This results in the incorrect behavior.
This fix addresses this issue by updating `docker inspect` to conform
to #21153 so the the behavior of `docker inspect` and `docker run` is
consistent.
A integration test has been added to cover this fix.
This fix fixes #21956 . This fix is related to #21153 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
2016-05-02 21:14:42 -07:00
Charles Smith
e8cb44fe81
Merge pull request #2072 from allencloud/update-docs-about-kernel-version
...
update docs about kernel version support in production
2016-05-02 20:50:26 -07:00
Joao Fernandes
dbd4efa272
Adds reference docs for bootstrapper
...
* fixes #1914
2016-05-02 20:41:13 -07:00
Joao Fernandes
0d13fcbee9
Improves docs menu entries
2016-05-02 19:29:53 -07:00
Ke Xu
96a39d0397
add docs for zsh completion
...
Signed-off-by: Ke Xu <leonhartx.k@gmail.com >
2016-05-03 11:03:12 +09:00
Joao Fernandes
dd1079d21b
Adds docs for DTR 2.0
...
* fixes #1725
* fixes #1830
* fixes #1899
* fixes #1908
* fixes #1911
* fixes #1912
* fixes #1913
* fixes #1915
2016-05-02 18:48:32 -07:00
Joao Fernandes
822345fb97
Adds unique ids for all doc pages
2016-05-02 18:38:18 -07:00
Joao Fernandes
930a5f1810
Merge pull request #1852 from SvenDowideit/use-docs-base-oss
...
convert docs Dockerfiles to use docs/base:oss
2016-05-02 18:20:42 -07:00
Tonis Tiigi
641c1808e1
Move implicit pull test to use local registry
...
Using hub only works for amd64 platforms.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-05-02 18:14:13 -07:00
Sven Dowideit
4394b8eee7
Merge pull request #63 from SvenDowideit/use-docs-base-oss
...
convert docs Dockerfiles to use docs/base:oss
2016-05-03 10:49:26 +10:00
Sven Dowideit
1c0edf6c39
Merge pull request #22394 from SvenDowideit/use-docs-base-oss
...
convert docs Dockerfiles to use docs/base:oss
2016-05-03 10:48:29 +10: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
Sven Dowideit
c1c8c70800
Merge pull request #3392 from SvenDowideit/use-docs-base-oss
...
convert docs Dockerfiles to use docs/base:oss
2016-05-03 10:47:00 +10:00
Aaron Lehmann
ca95f64968
Merge pull request #22457 from LK4D4/fix_error_format
...
image/tarexport: fix error formatting
2016-05-02 17:27:27 -07:00
Brian Goff
227c83826a
Merge pull request #21945 from rhvgoyal/export-min-free-space
...
Export Mininum Thin Pool Free Space through docker info
2016-05-02 20:20:08 -04:00
Sven Dowideit
f53e8ee0e1
Make unique menu title
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2016-05-02 23:50:40 +00:00
Joffrey F
94bcbd1fb6
Merge pull request #3388 from andrerom/patch-1
...
Clarify env-file doc that .env is read from cwd
2016-05-02 16:04:03 -07:00
Sebastiaan van Stijn
8d4ccd1925
Merge pull request #22459 from twistlock/authorization_docs_fix
...
Remove response modification sections from authorization design doc
2016-05-02 23:43:05 +02:00
Joffrey F
3e11a95056
Merge pull request #3400 from shin-/3333-raise-up-errors
...
Properly handle APIError failures in Project.up
2016-05-02 14:34:12 -07:00
Alexander Morozov
1c1a1280ac
Merge pull request #22458 from estesp/betty-junods-cast
...
Add Joan & Samuel Curran, Welsh scientist and Irish physicist couple
2016-05-02 14:30:32 -07:00
Joffrey F
310b3d9441
Properly handle APIError failures in Project.up
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-05-02 13:42:05 -07: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
Nishant Totla
8cbb1b27a4
Merge pull request #2191 from dongluochen/testhang
...
Update stats test to stop connection
2016-05-02 13:32:04 -07:00
Dongluo Chen
1baec48803
Merge pull request #2199 from dongluochen/pstestfailure
...
Fix api/ps tests
2016-05-02 13:28:18 -07:00
Brian Goff
75e63c942e
Merge pull request #21153 from mountkin/log-validator
...
inherit the daemon log options when creating containers
2016-05-02 16:12:43 -04:00
Dong Chen
116748e7bc
Fix api/ps tests.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-05-02 12:26:56 -07:00
Liron Levin
638096431a
Remove response modification sections from authorization design doc
...
Signed-off-by: Liron Levin <liron@twistlock.com >
2016-05-02 22:19:23 +03:00
Phil Estes
62bd539629
Add Joan & Samuel Curran, Welsh scientest and Irish physicist couple
...
In honor of Betty Junod's cast, and her tweet about Joan Curran:
https://twitter.com/BettyJunod/status/727194712956784641
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
2016-05-02 14:50:16 -04:00
Brian Goff
d4559313d5
Set Pdeathsig for containerd on SIGKILL
...
Makes sure containerd exits (when started by docker) if docker gets
SIGKILL'd.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-05-02 14:23:38 -04:00
Kenfe-Mickael Laventure
20e1b9593e
Update build-deb to make correct use of DOCKER_BUILD_PKGS
...
An environment variable cannot directly be used as a bash array, this
patch loops through all the IFS separated value (which default to
space) instead.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-05-02 11:22:01 -07:00
Brian Goff
988f481643
Update engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-05-02 14:17:40 -04:00