Commit Graph

20326 Commits

Author SHA1 Message Date
Michael Crosby ffd36a14e7 Move arm info to project/
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-11-23 13:54:17 -08:00
Michael Crosby 2ec186377e Remove scaleway info
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-11-23 13:53:54 -08:00
David Calavera aa22191093 Merge pull request #17356 from HuKeping/warn-on-oom
Warning out when disalbe oom killer but not set the memory limit
2015-11-23 12:43:04 -08:00
Aditi Rajagopal 5cfa13ae48 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>
2015-11-23 14:28:41 -05:00
Alexander Morozov 9687008378 Merge pull request #18104 from hypriot/17802-remove-journald-to-fix-dynbinary-build-on-ARM
remove journald to fix dynbinary build on ARM
2015-11-23 10:38:45 -08:00
Tianon Gravi 05d1a5aed6 Merge pull request #18152 from rgl/master
mkimage-arch: remove the test container after run
2015-11-23 10:35:15 -08:00
Alexander Morozov 804d2f73c8 Merge pull request #18080 from aditirajagopal/16756-docker_api_images_test
Checkers on integration-cli/docker_api_images_test
2015-11-23 10:21:52 -08:00
Sebastiaan van Stijn 86377e541d Merge pull request #18157 from Djelibeybi/master
Fix CHANGELOG.md
2015-11-23 18:42:38 +01:00
James Turnbull 097bc4881f Merge pull request #18167 from duglin/FixTagHelp
Add more to tag's -f flag's help
2015-11-23 11:59:22 -05:00
James Turnbull 2bc792e3bb Merge pull request #18132 from WeiZhang555/api-changelog
Add API change to docs
2015-11-23 11:57:46 -05:00
Sebastiaan van Stijn 5017a5dd69 Merge pull request #18161 from duglin/Issue18017
Add some docs about build-arg's impact on the cache
2015-11-23 17:57:28 +01:00
Doug Davis 5bf4766fca Add some docs about build-arg's impact on the cache
Closes #18017

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-23 08:51:11 -08:00
Aditi Rajagopal 463c53c715 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>
2015-11-23 10:33:32 -05:00
Doug Davis a70079ea23 Add more to tag's -f flag's help
Was noticed in #9798

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-23 07:20:10 -08:00
Zhang Wei bfe711bed3 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>
2015-11-23 22:42:55 +08:00
Sebastiaan van Stijn 1d1de645fd Merge pull request #18137 from vanpire110/master
Update understanding-docker.md again
2015-11-23 09:31:13 +01:00
Vincent Demeester 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
Avi Miller bb50f25b35 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>
2015-11-23 15:29:07 +11:00
moxiegirl 0f58421901 Merge pull request #18155 from SvenDowideit/docs-validation-fixes
Fixes found by docs validation tool
2015-11-22 19:39:09 -08:00
Sven Dowideit f4b2da0145 Merge pull request #18149 from jeffdm/master
Mark Windows 10 as supported in installation docs
2015-11-23 12:09:00 +10:00
Sven Dowideit 043f447e2e Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-11-23 11:19:38 +10:00
Sebastiaan van Stijn 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
Mark McKinstry 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
Rui Lopes ca94adc7c1 mkimage-arch: remove the test container after run
Signed-off-by: Rui Lopes <rgl@ruilopes.com>
2015-11-22 11:49:54 +00:00
unclejack 92756bdcdd Dockerfile: add python-dev to fix Python.h errors
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-11-22 12:32:10 +02:00
Zhang Wei 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
Jeffrey Morgan 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
Brian Goff 692bfdaee3 Merge pull request #18146 from JamesKyburz/random-additions
Random additions
2015-11-21 13:18:09 -05:00
Dieter Reuter 2bc57578c6 Sort make targets and DOCKER_ENV vars in alphabetical order
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2015-11-21 17:50:37 +01:00
Antonio Murdaca 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
James Kyburz f8a6726dad Add nauseous and pedantic
Signed-off-by: James Kyburz <james.kyburz@gmail.com>
2015-11-21 16:23:07 +01:00
Stefan Scherer 6f6f10a75f prevent journald from being built on ARM
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
2015-11-21 15:17:31 +01:00
Jeremy Qian f5343a039b update docs/introduction/understanding-docker.md
Signed-off-by: Jeremy Qian <vanpire110@163.com>
2015-11-21 10:43:25 +08:00
Alexander Morozov 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
Michael Crosby 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
David Calavera 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
David Calavera 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
Antonio Murdaca 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
Michael Crosby 8022e6292e Merge pull request #18131 from hypriot/18124-use-startwithbusybox
Fix integration-cli tests
2015-11-20 14:20:12 -08:00
Stefan Scherer 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
Michael Crosby 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
Stefan Scherer 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
Kanstantsin Shautsou 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
moxiegirl 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
David Calavera 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
Antonio Murdaca 3e7405aea8 Deprecate HostConfig at API container start
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-20 20:45:55 +01:00
Vincent Demeester f064b9941c Merge pull request #18073 from runcom/hostconfig-resources
runconfig: split resources into a struct
2015-11-20 20:29:44 +01:00
David Calavera 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
Michael Crosby 6e49343202 Merge pull request #18067 from cpuguy83/fix_pull_space_test
Make TestDaemonNoSpaceleftOnDeviceError linux only
2015-11-20 10:51:21 -08:00
Alexander Morozov 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