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
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
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
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
6df3fc5175
Remove call to template.Option when building with 1.4.
...
Windows still relies on 1.4.2 to build Docker.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-09 17:30:16 -05:00
efda9618db
Move networking api types to the api/types/networking package.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-12-09 13:55:59 -08:00
5ac12c418f
Don't dereference HostConfig.MemorySwapiness if nil
...
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-12-09 14:47:51 -07:00
1d775a54cc
Merge pull request #18541 from programmerq/inspect_command_ip_address
...
Add the actual command in this example.
2015-12-09 21:10:46 +01:00
8b6132aa15
Merge pull request #18538 from estesp/aufs-whiteout-userns-fix
...
Skip aufs whiteout files on userns translation to container
2015-12-09 14:47:01 -05:00
7470e39c73
Merge pull request #18533 from thaJeztah/fix-oracle-package-name
...
docs: fix incorrect package name on Oracle Linux
2015-12-09 20:24:39 +01:00
375f754f49
Merge pull request #18472 from calavera/api_client_lib
...
Api client lib
2015-12-09 19:17:11 +01:00
61b832dc5c
Merge pull request #18540 from thaJeztah/remove-redundant-check
...
Remove redundant check
2015-12-09 09:48:11 -08:00
d8d38f2345
Add the actual command in this example.
...
Signed-off-by: Jeff Anderson <jeff@docker.com>
2015-12-09 10:17:39 -07:00
2ec468e284
Make the commit configuration to be a typed struct rather than accepting a string.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-09 12:06:58 -05:00
57b6796304
Implement all inspect commands with the new inspector interface.
...
It makes the behavior completely consistent across commands.
It adds tests to check that execution stops when an element is not
found.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-09 12:05:01 -05:00
5a0a6ee9cd
Remove old http from the docker cli.
...
Everything has been ported to the client library 🎉
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-09 12:05:00 -05:00
e4abf48567
Implement docker search with standalone client lib.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-09 12:05:00 -05:00
d1057e4c46
Implement docker resize with standalone client lib.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-09 12:05:00 -05:00
cf3efd05d4
Implement docker inspect with standalone client lib.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-09 12:05:00 -05:00
Sebastiaan van Stijn