Victor Vieux
64b9c50b69
use same HTTP client as dockerengine
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2016-02-11 15:03:38 -08:00
Jess Frazelle
2a64d400b3
Merge pull request #20114 from jfrazelle/fix-release-script
...
get os arch for release script
2016-02-11 17:28:23 -05:00
Nishant Totla
ee39394741
Removing hard-coded ip from swarm w/ machine doc
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2016-02-11 14:27:09 -08:00
David Gageot
87a659efb3
Merge pull request #3042 from dgageot/3016-add-timeout-to-active-command
...
Add timeout to active command
2016-02-11 14:15:18 -08:00
Aidan Hobson Sayers
dfb00652aa
Expose bridge IPv6 setting to docker network inspect
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
2016-02-11 22:13:47 +00:00
Derek McGowan
6d6c37c06a
Update client section
...
Use client_id as defined in oauth rfc instead of custom client field
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-02-11 13:57:23 -08:00
Derek McGowan
32931689d5
Add scope documentation
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-02-11 13:57:23 -08:00
Derek McGowan
d8b59ab637
Add specification for using oauth with the token server
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-02-11 13:57:23 -08:00
David Gageot
7a6ca308c4
FIX #3016 Add timeout to active command
...
Signed-off-by: David Gageot <david@gageot.net >
2016-02-11 13:55:52 -08:00
David Gageot
5178043d02
Merge pull request #3041 from dgageot/3040-fix-slow-test
...
FIX #3040 Slow test
2016-02-11 13:55:04 -08:00
Sebastiaan van Stijn
73ee139d7a
Merge pull request #20245 from jfrazelle/20082-cap-add-docs-updates
...
update cap-add docs for seccomp
2016-02-11 22:52:26 +01:00
Vincent Demeester
4cdd0403cd
Merge pull request #20218 from icecrime/fix_remote_integration-cli
...
Improve remote integration-cli tests
2016-02-11 22:51:20 +01:00
Alexander Morozov
02a37a281c
Merge pull request #20239 from calavera/remove_server_port_allocation
...
Move listeners and port allocation outside the server.
2016-02-11 13:50:48 -08:00
Christopher Jones
045aee2002
Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart
...
Fixes #19368 by waiting until all container statuses are running
before killing the daemon
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2016-02-11 16:47:40 -05:00
Jessica Frazelle
1e92e5fdaa
update cap-add docs for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2016-02-11 13:47:08 -08:00
David Calavera
931e78df1b
Merge pull request #20231 from vdemeester/move-getcontext-away
...
Move getContext… function to builder package
2016-02-11 13:38:57 -08:00
Nishant Totla
d9914ffa59
Merge pull request #1801 from dongluochen/rescheduleTest
...
Fix race condition in rescheduling test
2016-02-11 13:33:50 -08:00
David Gageot
8345672b18
FIX #3040 Slow test
...
Signed-off-by: David Gageot <david@gageot.net >
2016-02-11 13:31:36 -08:00
Joffrey F
77cf67ba8a
Merge pull request #2888 from dnephin/upgrade_pyinstaller
...
Upgrade pyinstaller.
2016-02-11 12:11:57 -08:00
Joffrey F
5eb45a31e6
Merge pull request #2883 from shin-/2849-log-volume-creation
...
Add logging when initializing a volume.
2016-02-11 12:11:28 -08:00
Dong Chen
513490feb5
Fix race condition in rescheduling test.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-02-11 12:02:54 -08:00
Vincent Demeester
312f5e435b
Move getContext… function to builder package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2016-02-11 20:59:59 +01:00
David Calavera
34c29277c2
Move listeners and port allocation outside the server.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-02-11 14:42:49 -05:00
Joffrey F
e225f12551
Add logging when initializing a volume.
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-02-11 11:40:22 -08:00
Ying Li
b673a15a49
Merge pull request #555 from docker/remove-kdb-from-verify
...
Remove keyDB from signed.Verify
2016-02-11 11:36:15 -08:00
Joffrey F
830a9fc118
Merge pull request #2889 from dnephin/fix_test_broken_on_master
...
Shm_size requires docker 1.10
2016-02-11 11:18:45 -08:00
Victor Vieux
494e0655dd
do not lower keys
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2016-02-11 11:15:44 -08:00
Daniel Nephin
532dffd688
Fix build section without context.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-02-11 14:12:02 -05:00
Olivier Gambier
4262a8fde5
Merge pull request #3034 from davemkirk/3025-registry-env-var
...
Add ENGINE_REGISTRY_MIRROR env var support.
2016-02-11 11:05:34 -08:00
Victor Vieux
cd3b1d5bd1
improve addNetwork
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2016-02-11 11:00:15 -08:00
Jeffrey Morgan
902fb2ec66
Merge pull request #1462 from moxiegirl/remove-tutorials
...
Updating Dockerfile
2016-02-11 10:59:30 -08:00
Anusha Ragunathan
f3b2233d12
Add "dummy" network module for arm images.
...
A few libnetwork integration tests require that the kernel be configured
with the "dummy" network interface and has the module loaded. However,
the dummy module is not available by default on arm images. This ensures
that it is built and loaded.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
2016-02-11 10:53:51 -08:00
Daniel Nephin
1e7dd2e740
Upgrade pyinstaller.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-02-11 13:50:41 -05:00
Daniel Nephin
740329a131
Shm_size requires docker 1.10.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-02-11 13:50:23 -05:00
Aaron Lehmann
7b81bc147c
Fall back to V1 when there are no basic auth credentials
...
This makes the behavior consistent with having incorrect credentials.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-02-11 10:48:11 -08:00
Olivier Gambier
bf991fec01
Merge pull request #1455 from RichardScothern/grammar-correct
...
Reference name rather than repository in reference grammar
2016-02-11 10:40:22 -08:00
Aaron Lehmann
4436f07ef4
Update vendored docker/distribution
...
The registry/client/auth package now provides ErrNoBasicAuthCredentials.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-02-11 10:28:18 -08:00
Richard Scothern
846328977e
Reference name rather than repository in reference grammar
...
Signed-off-by: Richard Scothern <richard.scothern@docker.com >
2016-02-11 10:26:32 -08:00
Olivier Gambier
7b66c50bb7
Merge pull request #1452 from aaronlehmann/export-no-credentials-error
...
Export "no basic auth credentials" as an error value
2016-02-11 10:09:22 -08:00
David Gageot
eae3a747b7
Merge pull request #3038 from jeanlaurent/doc-lint-ref
...
Markdown linting in docs/reference directory
2016-02-11 09:52:03 -08:00
Brian Goff
944e4cab2e
Merge pull request #20124 from calavera/fix_vendor_codec_cleanup
...
Do not purge github.com/ugorji/go/codec from vendor.
2016-02-11 12:51:35 -05:00
Ying Li
ac265186ee
Rename repo.GetRole to repo.GetRoleWithNames and use the Keys data structure more.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-02-11 09:51:08 -08:00
Daniel Nephin
7bae4cdbb2
Merge pull request #2875 from aanand/fix-version-in-install-guide
...
Fix version in install guide
2016-02-11 12:43:51 -05:00
Aanand Prasad
23ab2c7e44
Merge pull request #2878 from dnephin/merge_build_args
...
Merge build.args when merging services
2016-02-11 17:41:41 +00:00
Aanand Prasad
b8f7bbb84e
Merge pull request #2830 from nubs/master
...
Add support for shm_size. Fixes #2823 .
2016-02-11 17:34:44 +00:00
Jean-Laurent de Morlhon
f6cb147f0d
Markdown linting in docs/reference directory
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2016-02-11 09:29:52 -08:00
Joffrey F
a5d95612e0
Merge pull request #2881 from humitos/patch-1
...
Typo fixed
2016-02-11 09:28:08 -08:00
Sebastiaan van Stijn
d4d0b8a42b
Merge pull request #20234 from kiawin/20232-improve-overriding-user-command-details
...
Improve usage details on overriding USER command in Docker run refere…
2016-02-11 18:18:26 +01:00
Phil Estes
6672d7de20
Merge pull request #20214 from mavenugo/vin0.7.0-dev.1
...
Vendor libnetwork v0.7.0-dev.2
2016-02-11 12:12:58 -05:00
Brian Goff
f6523a44cc
Merge pull request #20233 from tianon/busybox-dbus
...
Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore)
2016-02-11 11:43:28 -05:00