375b6e5bf3
Move arm info to project/
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: ffd36a14e7a2d0eef2e3b20b42045ae1c6c90957
Component: engine
2015-11-23 13:54:17 -08:00
899956d9a0
Remove scaleway info
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 2ec186377eef75efafb58c56ea4ebb673e60b9fd
Component: engine
2015-11-23 13:53:54 -08:00
f78f99b00a
Merge pull request #17356 from HuKeping/warn-on-oom
...
Warning out when disalbe oom killer but not set the memory limit
Upstream-commit: aa22191093e5becfa8167e4961b617f15a81894a
Component: engine
2015-11-23 12:43:04 -08:00
eec4fc2636
Checkers on integration-cli/docker_api_info_test
...
Applying #16756 to integration-cli/docker_api_info_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 5cfa13ae486ec2305ee31eaf89e3ec17dd84610b
Component: engine
2015-11-23 14:28:41 -05:00
6214bfcd81
Merge pull request #18104 from hypriot/17802-remove-journald-to-fix-dynbinary-build-on-ARM
...
remove journald to fix dynbinary build on ARM
Upstream-commit: 968700837890c2a5d1dc41aa871f3c94aca07640
Component: engine
2015-11-23 10:38:45 -08:00
fb7e6b309b
Merge pull request #18152 from rgl/master
...
mkimage-arch: remove the test container after run
Upstream-commit: 05d1a5aed6ba27ba5f03ba798beb4fb4f11de9e2
Component: engine
2015-11-23 10:35:15 -08:00
fa0725341b
Merge pull request #18080 from aditirajagopal/16756-docker_api_images_test
...
Checkers on integration-cli/docker_api_images_test
Upstream-commit: 804d2f73c8996600b3d57c69267c3131da2d3b37
Component: engine
2015-11-23 10:21:52 -08:00
151cad3e38
Merge pull request #18157 from Djelibeybi/master
...
Fix CHANGELOG.md
Upstream-commit: 86377e541db6acb8a3a175b9e4805e5a08792e0d
Component: engine
2015-11-23 18:42:38 +01:00
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
e121ed085e
Checkers on integration-cli/docker_api_images_test
...
Applying #16756 to integration-cli/docker_api_images_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 463c53c71556861c5bf6a59ce7ae2a3a90865606
Component: engine
2015-11-23 10:33:32 -05: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
60942ba73e
Ensure adding a broken tar doesn't silently fail
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: 3243e504d01ea1efa141f3e3cc296903d7d62ca4
Component: engine
2015-11-23 14:18:58 +00: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
0f91fa2633
Fix CHANGELOG.md so that RPM changelog generation has a date value for the 1.9.1 release.
...
Signed-off-by: Avi Miller <avi.miller@gmail.com >
Upstream-commit: bb50f25b35b5fdfc7b13cdc17f4039b92e2e6ea1
Component: engine
2015-11-23 15:29:07 +11: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
68fe06d253
mkimage-arch: remove the test container after run
...
Signed-off-by: Rui Lopes <rgl@ruilopes.com >
Upstream-commit: ca94adc7c1ff7719be704282fe6daf1fb57161e0
Component: engine
2015-11-22 11:49:54 +00:00
9f1a5d95f2
Dockerfile: add python-dev to fix Python.h errors
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 92756bdcdddc75bcf5aa7dab2c8238abdb18ab75
Component: engine
2015-11-22 12:32:10 +02: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
d5a762c65c
Sort make targets and DOCKER_ENV vars in alphabetical order
...
Signed-off-by: Dieter Reuter <dieter.reuter@me.com >
Upstream-commit: 2bc57578c604818514101fe643494b238902e49a
Component: engine
2015-11-21 17:50:37 +01: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
8f5a861b89
prevent journald from being built on ARM
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com >
Upstream-commit: 6f6f10a75f8b447637e8a89d685452871899e9c0
Component: engine
2015-11-21 15:17:31 +01:00
06f87da37b
mkimage-yum.sh to support dnf
...
included changes @tianon proposed in #17362
Signed-off-by: Elvir Kuric <elvirkuric@gmail.com >
Upstream-commit: 5c329633d7ce7adfa390e70b91c3e87c5d05ef93
Component: engine
2015-11-21 13:06:27 +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
31f8edbd47
Deprecate HostConfig at API container start
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 3e7405aea8589f4b6b0713640596f7dee9cf7193
Component: engine
2015-11-20 20:45:55 +01: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
