3aaad04eea
Merge pull request #23182 from crosbymichael/maxkeys
...
Change root_maxkeys
Upstream-commit: 8e8ef7c724accb8d3038ff14ab878b24af8a6f03
Component: engine
2016-06-27 13:46:11 -07:00
38bdd65e17
Merge pull request #24002 from crosbymichael/update-containerd-jun27
...
Update containerd to b93a33be39bc4ef0fb00bfcb79147
Upstream-commit: ee658a5aa5565ccdc2adc77c158e817d641f4991
Component: engine
2016-06-27 22:35:38 +02:00
ab805f2a0c
Merge pull request #23677 from anusha-ragunathan/mv_test_stable
...
Move daemon restart tests from experimental to stable.
Upstream-commit: 48eba0bfe6fcdd4c90740831e6a8b5aff6e0a5c0
Component: engine
2016-06-27 13:07:55 -07:00
242b7b9bf6
Merge pull request #22980 from thaJeztah/deprecate-shorthand-help
...
deprecate '-h' shorthand and remove '-help'
Upstream-commit: 276ed3755e2d2ca86736041cc181c11fd7254822
Component: engine
2016-06-27 21:45:04 +02:00
0dd6cb7e34
Merge pull request #23993 from allencloud/change-code-in-plugin
...
fix bug in plugins
Upstream-commit: 47a6196fc8eee498f8ff97a4e0c2c98cd744459f
Component: engine
2016-06-27 21:32:28 +02:00
92d47c5a14
Merge pull request #23867 from thaJeztah/fix-install-script
...
Fix installation script for RHEL
Upstream-commit: b01c46e1d8037b7d59c1c7d09afe2d81cec23986
Component: engine
2016-06-27 12:27:56 -07:00
c0eb5739c1
Merge pull request #23775 from mlaventure/change-stock-runtime-alias
...
Use "runc" as alias for the default runtime
Upstream-commit: 91fa49071d7373ccdee4585b403b488e1fce2efa
Component: engine
2016-06-27 11:55:46 -07:00
e9a348a21b
Update containerd to b93a33be39bc4ef0fb00bfcb79147
...
This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 7db7e046315eed5ccfb3a913b965be4b1a595601
Component: engine
2016-06-27 11:45:05 -07:00
76a6eac7ae
deprecate '-h' shorthand and remove '-help'
...
This deprecates the shorthand '-h', because we don't mention it as an option,
and it conflicts with the 'docker create -h/--hostname' option, so cannot be
used for all commands consistently.
This also removes the (single-dash) '-help' option. The single-dash variant was
marked "deprecated" in version 1.5.0 (basically, since it was added in
a2b529ead21e6ab9eafcb1b1d2437c725c43a06a), but still kept around to
prevent '-help' being treated as '-h -e -l -p', causing confusing
warnings.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6add695084151a54a503c6e2597e05c17aa3d37f
Component: engine
2016-06-27 11:29:37 -07:00
f68bab271b
Change root_maxkeys
...
Most modern distros have the limit for the maximum root keys at 1000000
but some do not. Because we are creating a new key for each container
we need to bump this up as the older distros are having this limit at
200.
Using 1000000 as the limit because that is that most distros are setting
this to now. If someone has this value configured over that we do not
change it.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: ca3e4545aa7d0da3a36fef41d85d02e9f2c4d15d
Component: engine
2016-06-27 10:23:37 -07:00
e1b43ae16a
add err handling, close fd
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 2281ce7e98ec983514450c33c0ef1d90262c3b4f
Component: engine
2016-06-27 23:51:54 +08:00
280c297dfd
Merge pull request #23868 from albers/completion-swarm-enhancements
...
bash completion enhancements for `docker {swarm,node,service}`
Upstream-commit: cccfe63e86f3842a2139d8b9c24bfab5be7639b8
Component: engine
2016-06-27 10:55:54 -04:00
48b4d2f0b1
Merge pull request #23697 from dongluochen/blockServiceModeChange
...
Do not allow service mode change
Upstream-commit: e2a26744f987199dca7eacf93e3e236764c87f5e
Component: engine
2016-06-27 10:53:53 -04:00
551250ce4b
Merge pull request #23967 from duglin/removeLine
...
Remove blank line on daemon output when there are no containers to load
Upstream-commit: 982fc5edca7269eb28d3e732dc393bc4a9a18e00
Component: engine
2016-06-27 09:48:41 -04:00
56369a363d
Merge pull request #23801 from inercia/fix_docker_cli_by_digest
...
Make sure some integration tests check for the right return code
Upstream-commit: 1cfd37f432743b54f79d99064bfd8acf9ebd608c
Component: engine
2016-06-27 15:37:59 +02:00
aba19163d1
uppercase output in node inspect to keep consistency
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 89582e1a34a570c27232cd394d38f7fddf7e6520
Component: engine
2016-06-27 18:29:27 +08:00
39780ea801
Change the comments in TestPullFailsWithAlteredLayer and TestPullFailsWithAlteredLayer
...
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com >
Upstream-commit: b5f51e5281ddf677622d7d5e50048071e4cfcbc1
Component: engine
2016-06-27 11:06:32 +02:00
c472e6459f
Merge pull request #23743 from alxempirical/alxempirical-20160618-clarify-role-of-dockerhost
...
Clarify the role of `dockerhost` in the apt-cacher-ng example.
Upstream-commit: 1d2adbdd52fd68dd934b2a7b81ddfe13b8d055fb
Component: engine
2016-06-27 11:42:56 +10:00
4e7ee7d797
Merge pull request #23842 from tjanez/docs-systemd-default-target
...
Use 'default.target' in systemd unit file example
Upstream-commit: 96b0323cf00221e27155e7a005b53f0178b4cbae
Component: engine
2016-06-27 11:42:05 +10:00
0d19acd851
Remove blank line on daemon output when there are no containers to load
...
Its a minor thing but the daemon's output looks like this when there are
no containers to load:
```
INFO[0001] Loading containers: start.
INFO[0001] Loading containers: done.
```
That blank line (or more correctly, the \n) is unnecessary when
there are no containers to load since there is no `.` printed
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 478dd721ab7aca37264897b664dfa2ec953d7048
Component: engine
2016-06-26 10:51:34 -07:00
d43d3ef209
Merge pull request #23944 from tonistiigi/disable-iptables
...
Disable iptables in swarm test daemons
Upstream-commit: d4bff5e3aa014f7062f1d7a6c929336e2a88faff
Component: engine
2016-06-25 20:22:59 -04:00
2e7a10e1df
Update experimental docs dsb -> dab
...
Fixing bundle extension in experimental documentation.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8af760c9100d87ad89972c05312471b00f7f5691
Component: engine
2016-06-25 19:08:03 +02:00
f48a15762d
Merge pull request #23945 from aanand/update-bundle-extension
...
Update bundle extension
Upstream-commit: 58f1ae1641b81e3117a0e602e70464a139dcf74d
Component: engine
2016-06-25 17:00:33 +02:00
5058cd0f45
Merge pull request #23939 from vdemeester/rename-same-no-lock
...
No need for container.Lock if rename same name
Upstream-commit: 9ed0feece84f44d449c62f091566e119e97b7b63
Component: engine
2016-06-25 14:56:20 +02:00
96af8ab680
Merge pull request #23942 from aaronlehmann/sanbox
...
Fix "sanbox" typos
Upstream-commit: eae254d98b55d6d29aceb697af48e1aec20b2fb3
Component: engine
2016-06-25 11:27:46 +02:00
20c3dc512a
Merge pull request #23934 from cpuguy83/23862_fix_bind_opts
...
Fix panic due to nil bind options
Upstream-commit: b2ba44b11d7d05c43f3710946dbb9960c7b0adc7
Component: engine
2016-06-24 16:17:38 -07:00
2e3267c27b
Disable iptables in swarm test daemons
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: caaf92f7b4b947c5d226fb66a355b60fac683979
Component: engine
2016-06-24 15:47:37 -07:00
33bb05c194
Merge pull request #23281 from yongtang/23211-spf13-cobra-update
...
Use spf13/cobra for docker update
Upstream-commit: e5a8a7747ef8b9ac6ed4e508cd16a5cf2a44485c
Component: engine
2016-06-24 14:31:53 -07:00
da85d118fb
Merge pull request #23940 from allencloud/fix-err-msg
...
fix error message and typos in swarm cluster
Upstream-commit: 7ff546467de3fa3d1c1104e9f40c6d16742ebac0
Component: engine
2016-06-24 16:57:01 -04:00
e535398871
Merge pull request #23935 from LK4D4/fix_net_create_use
...
cli: fix network create usage
Upstream-commit: 824290a37e09f3411ceec439566c1e6c968a80ed
Component: engine
2016-06-24 16:55:12 -04:00
ec40967812
Update bundle extension
...
It's now .dab, for Distributed Application Bundle
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
Upstream-commit: 61e2d4240ba266518d0a9a862a88201e54502a88
Component: engine
2016-06-24 12:32:35 -07:00
f3ebf274bf
fix error message and typos in swarm cluster
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 39bc10c36d40677c11a800b4346c5cddec2b997d
Component: engine
2016-06-25 03:10:18 +08:00
5fee17f637
Remove log warning on task update
...
This warning appears in the course of normal use of swarm mode. Since
it's meant more as an internal TODO than something which should be
exposed to a user, remove the log message.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 39c93cfb47783f2531ba44f062fd9a8b351d2224
Component: engine
2016-06-24 12:07:47 -07:00
54c97d32bb
Fix "sanbox" typos
...
Correcting "sanbox" to "sandbox".
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: fa04558ac10d70bcdd501f01a5090607db32cc3a
Component: engine
2016-06-24 12:04:26 -07:00
b45c320ba6
Merge pull request #23914 from tonistiigi/upadate-manager-error-message
...
Add better error messages for unavailable swarm commands
Upstream-commit: e8ec19bd877847ddfd42cae4eddec83088e234fe
Component: engine
2016-06-24 12:02:34 -07:00
1d708b7135
Merge pull request #23933 from yp-engineering/service-log-typo
...
Fixing typo on service log output.
Upstream-commit: b73b303b1c974ea6d168eebdc2011b0802999ff1
Component: engine
2016-06-24 11:56:31 -07:00
c752679e24
Merge pull request #23872 from sfsmithcha/fix_scale_service_output
...
correct output description - only one task is running on manager
Upstream-commit: 39211d113bf16b371e49c12884020912c9c2c5ed
Component: engine
2016-06-24 11:04:28 -07:00
ebe2054ea2
No need for container.Lock if rename same name
...
During the renaming of a container, no need to call `container.Lock()`
if `oldName == newName`.
This is a follow-up from #23360 (commit 88d1ee6c112d980a63c625389524047fea32e6d9)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7e1ec8d2bd6d1aa77f824a1a4d717a7aa4cc3459
Component: engine
2016-06-24 19:55:48 +02:00
299779b4ac
Merge pull request #23360 from sainath14/rename_error
...
docker rename fix to address the issue of renaming with the same name
Upstream-commit: 88d1ee6c112d980a63c625389524047fea32e6d9
Component: engine
2016-06-24 19:54:09 +02:00
6414685519
Merge pull request #23918 from LK4D4/avoid_copy
...
pkg/pools: avoid copy of sync.Pool
Upstream-commit: 296b5c761f0aa853062fcb9fb10b172845a1986a
Component: engine
2016-06-24 19:35:43 +02:00
dda81cb1a9
Merge pull request #23921 from tonistiigi/test-timeouts
...
Increase test timeouts for node state changes
Upstream-commit: 23696e82658e8be1d428c63c52b52a51476d4248
Component: engine
2016-06-24 19:21:56 +02:00
009e2dd2e1
Add better error messages for unavailable swarm commands
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 803733120a1f9f080c6403f2a3717987393f1f0d
Component: engine
2016-06-24 10:14:57 -07:00
41c3862b06
cli: fix network create usage
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 159e7341ad80d6926fd9c09585afcc2abda25415
Component: engine
2016-06-24 09:32:39 -07:00
97e724b6b5
Fix panic due to nil bind options
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4c2e1a9cb04614d360e91a81959cb196380283b1
Component: engine
2016-06-24 11:57:17 -04:00
a463fd07fe
Merge pull request #23881 from tonistiigi/exec-wait
...
Fix error reporting on executor wait
Upstream-commit: e82dcf1c6de82680ae34a64735d0da0c080085ba
Component: engine
2016-06-24 11:18:49 -04:00
b44cab8db2
Merge pull request #23733 from tkopczynski/20784-builder-dockerfile-dispatchers
...
Builder/dockerfile/dispatchers.go unit tests
Upstream-commit: 4d7e08d6752f7413417de9ef2632266ee52c5897
Component: engine
2016-06-24 11:10:16 -04:00
1518772054
Merge pull request #23802 from inercia/fix_docker_cli_run_test
...
Make sure we compare string with the same capitalization
Upstream-commit: f6326d307667ea92ce6931985616d85d4e3248ed
Component: engine
2016-06-24 10:27:29 -04:00
dcf702388f
Merge pull request #23883 from AkihiroSuda/md2man105
...
update go-md2man to v1.0.5
Upstream-commit: 2fe294c16a7d75b9dcacda55aecf3bec6efe4781
Component: engine
2016-06-24 10:58:25 +02:00
645bbecbd4
Merge pull request #23875 from tonistiigi/task-node-down
...
Do not show tasks from down nodes as active in ls
Upstream-commit: cf54dfba349627a24c6f7b8e035367a7a9f68f84
Component: engine
2016-06-24 10:07:25 +02:00
bd0a2c513f
Merge pull request #23919 from Microsoft/jjh/prefix
...
Windows: Ensure frozen cope with prefix
Upstream-commit: bf08aae8522001f3358afe82aec52fea0d5d0458
Component: engine
2016-06-23 19:46:55 -07:00
