1d1de645fd
Merge pull request #18137 from vanpire110/master
...
Update understanding-docker.md again
2015-11-23 09:31:13 +01:00
a600bf4eab
Merge pull request #17489 from WeiZhang555/network-rm-multi
...
Enhance `docker network rm` to delete multi net
2015-11-23 08:25:33 +01:00
0f58421901
Merge pull request #18155 from SvenDowideit/docs-validation-fixes
...
Fixes found by docs validation tool
2015-11-22 19:39:09 -08:00
f4b2da0145
Merge pull request #18149 from jeffdm/master
...
Mark Windows 10 as supported in installation docs
2015-11-23 12:09:00 +10:00
043f447e2e
Fixes found by docs validation tool
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-11-23 11:19:38 +10:00
49f982b7ba
Merge pull request #18029 from mmckinst/stop_hardcode_el_version
...
use variable instead of hardcoding version in repo
2015-11-22 21:19:19 +01:00
196bd38fdb
use variable instead of hardcoding version in repo
...
Signed-off-by: Mark McKinstry <mmckinst@umich.edu>
2015-11-22 11:30:18 -05:00
e7eb6687ef
Enhance `docker network rm` to delete multi net
...
This commit enhance `docker network rm` command to allow user to delete
multi networks at the same time.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-22 05:37:00 +08:00
414c8565be
Mark Windows 10 as supported in install docs
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-21 13:42:32 -05:00
692bfdaee3
Merge pull request #18146 from JamesKyburz/random-additions
...
Random additions
2015-11-21 13:18:09 -05:00
3ff9bb5332
Merge pull request #16613 from WeiZhang555/docker-cp-symlink
...
Add option `-L` to allow `docker cp` follow symbol link
2015-11-21 17:03:24 +01:00
f8a6726dad
Add nauseous and pedantic
...
Signed-off-by: James Kyburz <james.kyburz@gmail.com>
2015-11-21 16:23:07 +01:00
f5343a039b
update docs/introduction/understanding-docker.md
...
Signed-off-by: Jeremy Qian <vanpire110@163.com>
2015-11-21 10:43:25 +08:00
afe6c1f30c
Merge pull request #18135 from calavera/exec_store
...
Move exec store to its own package inside the daemon.
2015-11-20 16:36:18 -08:00
048280ca42
Merge pull request #18134 from hypriot/17802-fix-integration-tests-for-arm
...
Increase timeouts to fix integration-cli tests on ARM
2015-11-20 15:05:26 -08:00
9ca2e4e81c
Move exec store to its own package inside the daemon.
...
Remove double reference between containers and exec configurations by
keeping only the container id.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-20 17:40:16 -05:00
7caa313c82
Merge pull request #18127 from KostyaSha/patch-1
...
Add Dead state to Container Inspect 1.21 API
2015-11-20 14:39:25 -08:00
6653f82796
Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates
...
modifying docker --since and --until to support nanoseconds and time …
2015-11-20 23:37:44 +01:00
8022e6292e
Merge pull request #18131 from hypriot/18124-use-startwithbusybox
...
Fix integration-cli tests
2015-11-20 14:20:12 -08:00
88c1bc10c4
Increase timeouts to fix test on ARM
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2015-11-20 23:12:12 +01:00
b5c507750f
Merge pull request #18051 from calavera/extract_streams
...
Extract StreamConfig struct out of the daemon package.
2015-11-20 13:45:13 -08:00
aef344dcf8
Replace s.d.Start() with s.d.StartWithBusybox()
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2015-11-20 22:16:19 +01:00
836d0127fd
Add Dead state to Container Inspect 1.21 API
...
Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
2015-11-21 00:06:37 +03:00
d395134b3d
Merge pull request #18094 from tophj-ibm/faq-link-fix
...
Fixed docker network link in faq
2015-11-20 12:13:07 -08:00
3f5b8f712d
Extract StreamConfig struct out of the daemon package.
...
This is a small configuration struct used in two scenarios:
1. To attach I/O pipes to a running containers.
2. To attach to execution processes inside running containers.
Although they are similar, keeping the struct in the same package
than exec and container can generate cycled dependencies if we
move any of them outside the daemon, like we want to do
with the container.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-20 15:04:27 -05:00
f064b9941c
Merge pull request #18073 from runcom/hostconfig-resources
...
runconfig: split resources into a struct
2015-11-20 20:29:44 +01:00
8fa09749fb
Merge pull request #17718 from wenchma/17716_before_filter_doc
...
Re-implement --before and --since as options for --filter
2015-11-20 11:24:19 -08:00
6e49343202
Merge pull request #18067 from cpuguy83/fix_pull_space_test
...
Make TestDaemonNoSpaceleftOnDeviceError linux only
2015-11-20 10:51:21 -08:00
6980113d10
Merge pull request #18126 from tiborvass/merge_release_v1.9.1
...
Merge release v1.9.1
2015-11-20 10:45:59 -08:00
75cb2dfe91
Bump version back to 1.10.0-dev
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-11-20 13:40:25 -05:00
1a0b483e02
runconfig: split resources into a struct
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-20 19:40:01 +01:00
fefbb507a9
Bump version to v1.9.1
...
Signed-off-by: Tibor Vass <tibor@docker.com>
Conflicts:
VERSION
2015-11-20 13:38:15 -05:00
c1f11f8144
Merge pull request #18109 from phemmer/yum-docs-fix
...
remove unnecessary echo from yum docs
2015-11-20 13:10:55 -05:00
a76bdea21b
Merge pull request #16168 from NIWAHideyuki/16164-shm-size
...
Addition of "--shm-size" to which size of /dev/shm is changed
2015-11-20 10:01:48 -08:00
44d3f2f71a
Make TestDaemonNoSpaceleftOnDeviceError linux only
...
Adds SameHostDaemon and DaemonIsLinux req's to
TestDaemonNoSpaceleftOnDeviceError
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-20 12:44:49 -05:00
f9a4751eeb
Merge pull request #18115 from wenchma/16756-docker_api_exec_test
...
Use checker Assert for integration-cli/docker_api_exec_test.go
2015-11-20 18:14:21 +01:00
6e727a4c80
Merge pull request #17456 from Microsoft/TestChtimesFix
...
Fix ChTimes to prevent setting times past the Unix Max Time
2015-11-20 18:07:09 +01:00
92600bdec1
Add '-L' option for `cp`
...
Fixes #16555
Original docker `cp` always copy symbol link itself instead of target,
now we provide '-L' option to allow docker to follow symbol link to real
target.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-21 00:36:56 +08:00
1814a1dac5
Use checker Assert for integration-cli/docker_api_exec_test.go
...
Partially fix issue #16756
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-20 23:34:52 +08:00
7a1b05ccce
Merge pull request #18101 from IanLee1521/patch-1
...
Fix minor grammar mistake.
2015-11-20 11:43:42 +01:00
d8ea32caa8
Merge pull request #18026 from woodvi/doc-network-tutorial
...
change "Web" to "web" to match case-sensitive name used for creation;…
2015-11-20 10:46:00 +01:00
20905ec452
Merge pull request #17861 from gissehel/apt-source-doc
...
explicit way to express that docker.list are different choices and not just one big file
2015-11-20 10:06:13 +01:00
3dac1fb189
Merge pull request #18079 from moxiegirl/fix-bad-markdown
...
Small Markdown Fixes to storage driver/commands ref
2015-11-20 09:22:04 +01:00
1921c62938
Re-implement --before and --since as options for --filter
...
* This commit will mark --before and --since as deprecated, but leave their behavior
unchanged until they are removed, then re-implement them as options for --filter.
* And update the related docs.
* Update the integration tests.
Fixes issue #17716
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-20 13:10:13 +08:00
3cbccccb37
remove unnecessary echo from yum docs
...
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
2015-11-19 20:51:43 -05:00
9941d5bc33
Small changes to storage driver/commands ref
...
Entering V's comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-19 17:13:23 -08:00
ee03a05595
Merge pull request #17005 from mavenugo/restart
...
Adding a restart test to make sure #16887 doesnt happens again
2015-11-19 17:01:34 -08:00
5aeaf2a0c4
Addition of "--shm-size" to which size of /dev/shm is changed.
...
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
when container is made.
- Being able to specify is a numerical value that applies number,
b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.
Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
2015-11-20 09:24:18 +09:00
249b3a9479
Merge pull request #17459 from brahmaroutu/Power_Z_CI
...
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
2015-11-19 15:50:07 -08:00
9c21e852b2
Merge pull request #18082 from MHBauer/gh9406
...
Remove defaults for flags/options that expect no value
2015-11-19 15:06:21 -08:00
Sebastiaan van Stijn
Vincent Demeester
moxiegirl
Sven Dowideit
Sven Dowideit
Mark McKinstry
Zhang Wei
Jeffrey Morgan
Brian Goff
Antonio Murdaca
James Kyburz
Jeremy Qian
Alexander Morozov
Michael Crosby
David Calavera
Stefan Scherer
Kanstantsin Shautsou
Tibor Vass
Antonio Murdaca
Jess Frazelle
Tibor Vass
Wen Cheng Ma
Patrick Hemmer
NIWA Hideyuki