29c73dc71d
Merge pull request #18167 from duglin/FixTagHelp
...
Add more to tag's -f flag's help
Upstream-commit: 097bc4881f37d4154c88874ee16fbaf1e346a193
Component: engine
2015-11-23 11:59:22 -05:00
ffce8a5c20
Merge pull request #18132 from WeiZhang555/api-changelog
...
Add API change to docs
Upstream-commit: 2bc792e3bb0f444ce25f112f604149da26a217b4
Component: engine
2015-11-23 11:57:46 -05:00
713c4dbaf0
Add some docs about build-arg's impact on the cache
...
Closes #18017
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 5bf4766fcaae80b80d53cce88987a8d3a9ac357e
Component: engine
2015-11-23 08:51:11 -08:00
8923491bd9
Add more to tag's -f flag's help
...
Was noticed in #9798
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: a70079ea23e8a36f9b3b517f7e7e87b8e24f3526
Component: engine
2015-11-23 07:20:10 -08:00
a12e446a79
Add API change to docs
...
Add API change description to docs due to `docker network inspect`
returns different data structure.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: bfe711bed342202ed0918a309b2000bb158c4eb7
Component: engine
2015-11-23 22:42:55 +08:00
824d689a06
Merge pull request #18137 from vanpire110/master
...
Update understanding-docker.md again
Upstream-commit: 1d1de645fd52dd2f886ca650b645c960f2cb219c
Component: engine
2015-11-23 09:31:13 +01:00
6e71f2c42e
Merge pull request #17489 from WeiZhang555/network-rm-multi
...
Enhance `docker network rm` to delete multi net
Upstream-commit: a600bf4eab48a19ea9d1919f95f612cdb229c893
Component: engine
2015-11-23 08:25:33 +01:00
a42c84fec2
Merge pull request #18155 from SvenDowideit/docs-validation-fixes
...
Fixes found by docs validation tool
Upstream-commit: 0f584219017d0fa9d224f1ca582f281a54e6db2b
Component: engine
2015-11-22 19:39:09 -08:00
5cbd0cc745
Merge pull request #18149 from jeffdm/master
...
Mark Windows 10 as supported in installation docs
Upstream-commit: f4b2da0145a6f530bc02a893055cc8b7e237fd87
Component: engine
2015-11-23 12:09:00 +10:00
6df421c14f
Fixes found by docs validation tool
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 043f447e2e9ecb9d6f34bcee6c11f20f263baf66
Component: engine
2015-11-23 11:19:38 +10:00
d196c9abf0
use variable instead of hardcoding version in repo
...
Signed-off-by: Mark McKinstry <mmckinst@umich.edu >
Upstream-commit: 196bd38fdbd05701294eb924755fd551b977d87c
Component: engine
2015-11-22 11:30:18 -05:00
3a475c3707
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 >
Upstream-commit: e7eb6687ef7da34cd69b27cfbaf3fd8112073530
Component: engine
2015-11-22 05:37:00 +08:00
e029cc86e6
Mark Windows 10 as supported in install docs
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
Upstream-commit: 414c8565be6c7edf02880ab1d64f7da4515ce593
Component: engine
2015-11-21 13:42:32 -05:00
f9f128d85f
Merge pull request #18146 from JamesKyburz/random-additions
...
Random additions
Upstream-commit: 692bfdaee3b48f4e5174bb80098692a0ded1aecf
Component: engine
2015-11-21 13:18:09 -05:00
9f0c131692
Merge pull request #16613 from WeiZhang555/docker-cp-symlink
...
Add option `-L` to allow `docker cp` follow symbol link
Upstream-commit: 3ff9bb53326312a66fee19bc56dd2ad9c642b133
Component: engine
2015-11-21 17:03:24 +01:00
d6089c6fe2
Add nauseous and pedantic
...
Signed-off-by: James Kyburz <james.kyburz@gmail.com >
Upstream-commit: f8a6726daddedd33c9e14db2133b0f5321c5ff5f
Component: engine
2015-11-21 16:23:07 +01:00
add6b1169c
update docs/introduction/understanding-docker.md
...
Signed-off-by: Jeremy Qian <vanpire110@163.com >
Upstream-commit: f5343a039bc28b5c290c72b5305436f526e81eba
Component: engine
2015-11-21 10:43:25 +08:00
84c6cbaa3c
Merge pull request #18135 from calavera/exec_store
...
Move exec store to its own package inside the daemon.
Upstream-commit: afe6c1f30c9563c0f142ef56067b0afcad4512ef
Component: engine
2015-11-20 16:36:18 -08:00
9fb90e10c1
Merge pull request #18134 from hypriot/17802-fix-integration-tests-for-arm
...
Increase timeouts to fix integration-cli tests on ARM
Upstream-commit: 048280ca42e5855bfe7850f4f30843d2ad675861
Component: engine
2015-11-20 15:05:26 -08:00
4c65875314
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 >
Upstream-commit: 9ca2e4e81cdb950f2b5958a7712153d1a6dd6e4c
Component: engine
2015-11-20 17:40:16 -05:00
00b4e54e91
Merge pull request #18127 from KostyaSha/patch-1
...
Add Dead state to Container Inspect 1.21 API
Upstream-commit: 7caa313c821a06af4f1423dbbf17d0b77ff17c31
Component: engine
2015-11-20 14:39:25 -08:00
b97ed2a561
Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates
...
modifying docker --since and --until to support nanoseconds and time …
Upstream-commit: 6653f827965b431139af141fa2cc68a6513abe71
Component: engine
2015-11-20 23:37:44 +01:00
ef86d50578
Merge pull request #18131 from hypriot/18124-use-startwithbusybox
...
Fix integration-cli tests
Upstream-commit: 8022e6292ed8e4676fdc65ad80ee3b68629493e7
Component: engine
2015-11-20 14:20:12 -08:00
b4b584649d
Increase timeouts to fix test on ARM
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 88c1bc10c4c2490789953e4d6065cab6e9b1585b
Component: engine
2015-11-20 23:12:12 +01:00
2b61f40d62
Merge pull request #18051 from calavera/extract_streams
...
Extract StreamConfig struct out of the daemon package.
Upstream-commit: b5c507750f2c7f616ed94ad502f5f6904cad4eac
Component: engine
2015-11-20 13:45:13 -08:00
7980b28dbf
Replace s.d.Start() with s.d.StartWithBusybox()
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: aef344dcf801b1af67bc7ce6219e636e48c28a1f
Component: engine
2015-11-20 22:16:19 +01:00
fbb546d71a
Add Dead state to Container Inspect 1.21 API
...
Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com >
Upstream-commit: 836d0127fdf39d5e5978bc27f54a99aea636061b
Component: engine
2015-11-21 00:06:37 +03:00
1a66a2a6f7
Merge pull request #18094 from tophj-ibm/faq-link-fix
...
Fixed docker network link in faq
Upstream-commit: d395134b3df59cf9377c78255c56867f126c7674
Component: engine
2015-11-20 12:13:07 -08:00
a043562f2a
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 >
Upstream-commit: 3f5b8f712d693188b41b3d9b55e5e5213be48ef5
Component: engine
2015-11-20 15:04:27 -05:00
4d4420c373
Merge pull request #18073 from runcom/hostconfig-resources
...
runconfig: split resources into a struct
Upstream-commit: f064b9941c0c6070740339971a0bb59b4fe6195f
Component: engine
2015-11-20 20:29:44 +01:00
9479751884
Merge pull request #17718 from wenchma/17716_before_filter_doc
...
Re-implement --before and --since as options for --filter
Upstream-commit: 8fa09749fb7b5560ffc7f0a73005302f99d89d01
Component: engine
2015-11-20 11:24:19 -08:00
bbfff7fedd
Merge pull request #18067 from cpuguy83/fix_pull_space_test
...
Make TestDaemonNoSpaceleftOnDeviceError linux only
Upstream-commit: 6e49343202d77ef103eb2b4e33658b8bb18d7716
Component: engine
2015-11-20 10:51:21 -08:00
81780d8309
Bump version back to 1.10.0-dev
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 75cb2dfe911c39a084b78a5b0d79d11b0792dbed
Component: engine
2015-11-20 13:40:25 -05:00
012bc4d1d4
runconfig: split resources into a struct
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 1a0b483e02aff72c16871fb2f74644e091bda93c
Component: engine
2015-11-20 19:40:01 +01:00
ee83ee5115
Bump version to v1.9.1
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Conflicts:
VERSION
Upstream-commit: fefbb507a9c78f947e333b2e5eaf5923fc8709a8
Component: engine
2015-11-20 13:38:15 -05:00
4abbb3cdf7
Merge pull request #18109 from phemmer/yum-docs-fix
...
remove unnecessary echo from yum docs
Upstream-commit: c1f11f81441fffc556ec0a45cb299d16ffe04947
Component: engine
2015-11-20 13:10:55 -05:00
6d12941a33
Merge pull request #16168 from NIWAHideyuki/16164-shm-size
...
Addition of "--shm-size" to which size of /dev/shm is changed
Upstream-commit: a76bdea21ba204b1cdc6648a182ae82355350a5f
Component: engine
2015-11-20 10:01:48 -08:00
7dc1436aeb
Make TestDaemonNoSpaceleftOnDeviceError linux only
...
Adds SameHostDaemon and DaemonIsLinux req's to
TestDaemonNoSpaceleftOnDeviceError
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 44d3f2f71a9a522597655b7c8733422fe70c39a0
Component: engine
2015-11-20 12:44:49 -05:00
00f170cb07
Merge pull request #18115 from wenchma/16756-docker_api_exec_test
...
Use checker Assert for integration-cli/docker_api_exec_test.go
Upstream-commit: f9a4751eebaf1bce78be55dc2fa66d8fc45211d3
Component: engine
2015-11-20 18:14:21 +01:00
4599b4fbfc
Merge pull request #17456 from Microsoft/TestChtimesFix
...
Fix ChTimes to prevent setting times past the Unix Max Time
Upstream-commit: 6e727a4c8037d3ea43913ee23f34c9babaf420eb
Component: engine
2015-11-20 18:07:09 +01:00
27af07df7b
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 >
Upstream-commit: 92600bdec1284f9031868751f61bef476d2e1dbd
Component: engine
2015-11-21 00:36:56 +08:00
8bb950a677
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 >
Upstream-commit: 1814a1dac54eba86616a73b9430788a8c587d4cb
Component: engine
2015-11-20 23:34:52 +08:00
f0ecd6735e
Merge pull request #18101 from IanLee1521/patch-1
...
Fix minor grammar mistake.
Upstream-commit: 7a1b05ccce18cbec4742c0a766f3424f817837df
Component: engine
2015-11-20 11:43:42 +01:00
4cd1a52462
Merge pull request #18026 from woodvi/doc-network-tutorial
...
change "Web" to "web" to match case-sensitive name used for creation;…
Upstream-commit: d8ea32caa8b312d5b3b01b4e72b8e0e56d958653
Component: engine
2015-11-20 10:46:00 +01:00
fb0212db59
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
Upstream-commit: 20905ec452ef0139027c6b0e193dda0d83a59f69
Component: engine
2015-11-20 10:06:13 +01:00
295eff51a3
Merge pull request #18079 from moxiegirl/fix-bad-markdown
...
Small Markdown Fixes to storage driver/commands ref
Upstream-commit: 3dac1fb18915f3aee1fcdeeb0688340fe6809143
Component: engine
2015-11-20 09:22:04 +01:00
9380772bfb
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 >
Upstream-commit: 1921c629381d25ebff7b8b8c8348a0a81525f264
Component: engine
2015-11-20 13:10:13 +08:00
1b8755d994
remove unnecessary echo from yum docs
...
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com >
Upstream-commit: 3cbccccb37f6f50ebb49e9738af09a0d7d79549a
Component: engine
2015-11-19 20:51:43 -05:00
7c1d3da9d9
Small changes to storage driver/commands ref
...
Entering V's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 9941d5bc33bc50c9e4e1fcba05c0f011bc0ae082
Component: engine
2015-11-19 17:13:23 -08:00
5832a3ebde
Merge pull request #17005 from mavenugo/restart
...
Adding a restart test to make sure #16887 doesnt happens again
Upstream-commit: ee03a05595e6ecd373553d33a01aff4d18bcc63c
Component: engine
2015-11-19 17:01:34 -08:00
