ec1002db58
Merge pull request #18623 from jutaz/bugfix/typos
...
Bugfix - Typos
2015-12-13 19:52:31 +01:00
927b334ebf
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
2015-12-13 18:04:12 +02:00
f5e6b09783
Merge pull request #18620 from jeffjohnston/DOC-16770
...
Update configuring Docker article
2015-12-13 14:10:46 +01:00
94026969b4
Merge pull request #18389 from wenchma/doc_update_for_container-basics
...
docs: delete draft container-basics.md
2015-12-12 21:39:34 -08:00
34e38312bf
Merge pull request #18438 from bfirsh/update-getting-started-in-readme
...
Link getting started in readme to installation instructions
2015-12-12 21:29:26 -08:00
a77861bca7
Update configuring Docker article
...
Signed-off-by: Jeff Johnston <jeff.johnston.mn@gmail.com>
2015-12-12 20:36:48 -06:00
51ffc088a5
Merge pull request #18270 from hqhq/hq_refactor_verify_config
...
Move verify container resources to a separate function
2015-12-12 12:47:19 +01:00
1fffc0270f
Merge pull request #15365 from twistlock/14674-docker-authz
...
Docker authorization plug-in infrastructure
2015-12-12 12:30:33 +01:00
241f6d7107
Merge pull request #18592 from hqhq/hq_fix_start
...
Add lock for container update
2015-12-12 12:17:18 +01:00
8d36f097cf
Merge pull request #18613 from calavera/flack_streaming_events_test
...
Log events stream when TestEventStreaming fails.
2015-12-12 00:40:25 +01:00
83d0a86470
Merge pull request #18608 from calavera/rename_get_to_get_container
...
Rename `Daemon.Get` to `Daemon.GetContainer`.
2015-12-12 00:10:42 +01:00
a3056f9f72
Log events stream when TestEventStreaming fails.
...
Let the tag event some more time to be emitted.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-11 17:20:40 -05:00
91799c232e
Merge pull request #18610 from runcom/fix-warn
...
api: client: info: add newline after warning
2015-12-11 13:41:14 -08:00
a84982a9c7
Merge pull request #18591 from calavera/inspector_tests
...
Make sure template inspector always prints a carriage return.
2015-12-11 22:03:42 +01:00
bb3d7e1e65
api: client: info: add newline after warning
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-11 20:54:51 +01:00
de4ffdfe48
Change authz plugin argument name
...
Signed-off-by: Liron Levin <liron@twistlock.com>
2015-12-11 20:59:15 +02:00
d7d512bb92
Rename `Daemon.Get` to `Daemon.GetContainer`.
...
This is more aligned with `Daemon.GetImage` and less confusing.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-11 12:39:28 -05:00
5525593a68
Merge pull request #18595 from mariussturm/gelf-no-trim-18568
...
don't trim GELF message
2015-12-11 07:39:44 -08:00
cd648dce3a
Merge pull request #18242 from jfrazelle/i-have-no-idea
...
Remove ipc rule in docker-engine apparmor profile
2015-12-11 11:23:41 +01:00
a31435c8a2
dont trim gelf log message
...
Signed-off-by: Marius Sturm <marius@graylog.com>
2015-12-11 10:28:24 +01:00
b7af5bcd20
Fixing documentation comments by @thaJeztah
...
Signed-off-by: Dima Stopel <dima@twistlock.com>
2015-12-11 07:03:58 +02:00
c6bfb54ac1
Move verify container resources to a separate function
...
Make the code easy to view.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-11 10:59:29 +08:00
464eefd795
Add lock for container update
...
Container needs to be locked when updating the fields, and
this PR also remove the redundant `parseSecurityOpt` since
it'll be done in `setHostConfig`.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-11 10:33:13 +08:00
bc02d42d9e
Make sure template inspector always prints a carriage return.
...
To match with the raw inspector.
Adds tests to verify its functionality.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-10 21:13:13 -05:00
23bd9b881f
Merge pull request #18577 from devvyn/patch-1
...
Update custom-docker0.md (corrections)
2015-12-11 02:38:24 +01:00
8cd356630a
Merge pull request #18142 from ekuric/mkimage
...
mkimage-yum.sh to support dnf
2015-12-11 02:27:13 +01:00
a16a1d75d9
Merge pull request #18564 from runcom/warn-on-loopback
...
api: client: info: print a warning if dm is using a loopback file
2015-12-11 10:11:03 +10:00
b89676bead
Merge pull request #18580 from tophj-ibm/fix-typo-blkio-invalid-device
...
Fix typo in named test and docs.
2015-12-10 15:19:41 -08:00
ac453a310b
Merge pull request #18353 from aaronlehmann/transfer-manager
...
Improved push and pull with upload manager and download manager
2015-12-10 14:52:48 -08:00
7c077c2c34
Fixed typo change deivce to device.
...
This changes deivce to device in daemon, test and docs.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-12-10 15:23:05 -06:00
9381c744b8
Merge pull request #18566 from coolljt0725/fix_18544
...
Probably fix flaky test TestExecTTY
2015-12-10 12:53:47 -08:00
a0f80079b8
Merge pull request #18557 from cpuguy83/use_correct_resize_fn
...
Use correct fn for resizing TTY
2015-12-10 12:37:13 -08:00
76de01c138
Update custom-docker0.md (corrections)
...
Corrected outdated internal link (regarding ```ip_forward``` system setting) . Corrected missing newline before bulleted list (for options configurable at server startup).
Signed-off-by: Devvyn Murphy <devvyn@devvyn.com>
2015-12-10 13:24:02 -06:00
13155ac47e
Merge pull request #18555 from runcom/clean-devmapper
...
devmapper: remove unused var
2015-12-10 18:17:04 +01:00
31a31adf7e
Merge pull request #18459 from Microsoft/jjh/winci-bash4fix
...
Windows CI Fix: Allow bash v4
2015-12-10 08:58:32 -08:00
2ea48e9fc0
Merge pull request #18197 from nalind/workaround-go-libgcc
...
Work around a linking problem on 32-bit arches
2015-12-10 11:50:03 -05:00
8e2c27abeb
Merge pull request #18565 from hqhq/hq_fix_ensure_format
...
Fix format issue
2015-12-10 08:27:15 -08:00
a2c4c0cd3a
api: client: info: print a warning if dm is using a loopback file
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-10 14:05:28 +01:00
3d82564c7a
Merge pull request #18562 from haoshuwei/modify-wordspelling-in-docker-stats
...
Modify word spelling in stats.go's comments
2015-12-10 13:32:10 +01:00
0e16eacad4
Probably fix flaky test TestExecTTY
...
sleep 2 seconds before exec exit to make sure
the output of `cat /foo` will be read
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-12-10 04:13:58 -05:00
d46650b3c7
Merge pull request #18553 from calavera/remove_specific_go_1_5_calls
...
Remove call to template.Option when building with 1.4.
2015-12-10 09:28:00 +01:00
037cbcec98
devmapper: remove unused var
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-10 08:28:02 +01:00
bd00905614
Fix format issue
...
Remove prefix and suffix spaces and tabs.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-10 15:18:16 +08:00
413e058b72
Modify word spelling errors in stats.go
...
Signed-off-by: Shuwei Hao <haosw@cn.ibm.com>
2015-12-10 06:57:25 +00:00
ff0e33824a
Merge pull request #18550 from ibuildthecloud/panic
...
Don't dereference HostConfig.MemorySwapiness if nil
2015-12-09 23:11:18 -05:00
3260ddb10b
Use correct fn for resizing TTY
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-12-09 22:55:01 -05:00
d92e7ad735
Update docs for addition of transfer manager
...
Closing the HTTP connection requesting a push or pull will cancel the
push or pull. This behavior also applies to the CLI.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-09 19:13:35 -08:00
572ce80230
Improved push and pull with upload manager and download manager
...
This commit adds a transfer manager which deduplicates and schedules
transfers, and also an upload manager and download manager that build on
top of the transfer manager to provide high-level interfaces for uploads
and downloads. The push and pull code is modified to use these building
blocks.
Some benefits of the changes:
- Simplification of push/pull code
- Pushes can upload layers concurrently
- Failed downloads and uploads are retried after backoff delays
- Cancellation is supported, but individual transfers will only be
cancelled if all pushes or pulls using them are cancelled.
- The distribution code is decoupled from Docker Engine packages and API
conventions (i.e. streamformatter), which will make it easier to split
out.
This commit also includes unit tests for the new distribution/xfer
package. The tests cover 87.8% of the statements in the package.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-09 19:13:35 -08:00
10bbe0ee7c
Merge pull request #18552 from dnephin/move_network_types
...
Move networking api types to the api/types/networking package.
2015-12-09 17:42:14 -08:00
0b930e8fec
Merge pull request #18417 from jfrazelle/remove-parallel
...
remove parallel we no longer use it
2015-12-09 16:26:02 -08:00
Antonio Murdaca