Commit graph

20184 commits

Author SHA1 Message Date
Christopher Jones
ad179e0e95 Fixed broken links, and updated some to https
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-11-24 10:39:02 -05:00
Sebastiaan van Stijn
56305adf4a Merge pull request #18188 from wenchma/doc_update
Correct some typos for docs
2015-11-24 12:01:17 +01:00
Vincent Demeester
3a109fcfa2 Merge pull request #18186 from aditirajagopal/16756-docker_api_inspect_unix_test
Checkers on docker_api_inspect_unix_test.go
2015-11-24 10:18:31 +01:00
Wen Cheng Ma
4d66f18be0 Correct some typos for docs
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-24 15:14:32 +08:00
Tianon Gravi
ae1fadeb96 Merge pull request #17714 from mikedougherty/cs-release-fixes
Fixes for release scripts
2015-11-23 19:47:10 -08:00
Aditi Rajagopal
d53a9bcb13 Checkers on docker_api_inspect_unix_test.go
Applying #16756 to integration-cli/docker_api_inspect_unix_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-23 22:03:14 -05:00
Mike Dougherty
a15b67b1af Fixes for release scripts:
Add a flag to allow keeping bundles around (helps with CI)

Fix several problems in repo make targets

* quote DOCKER_EXPERIMENTAL variable
* pass-through arguments for gpg  provided to dpkg-sig are now quoted
  properly, so passphrases with shell-interpolated symbols can be used
* when determining deb suites, don't rely on 'origin' to be
  github.com/docker/docker

Fix some issues with deb repository creation from scratch

* Don't add empty components to the repository configuration as they
  will cause failure when generating.

Add old docker-engine-cs name to package conflicts

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2015-11-23 17:15:54 -08:00
Sebastiaan van Stijn
919a068fb6 Merge pull request #18171 from MHBauer/gh7205
update 'top' api endpoint documentation
2015-11-24 01:30:15 +01:00
David Calavera
4cb9d298c6 Merge pull request #18147 from DieterReuter/sort-make-targets
Sorting make targets and DOCKER_ENV vars in alphabetical order
2015-11-23 15:55:28 -08:00
Morgan Bauer
e28e4c7840
update 'top' api endpoint documentation
- update example based on '-ef' behavior
 - new example specifying ps args 'aux'
 - resolves #7205

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-11-23 15:41:34 -08:00
Alexander Morozov
18c9fe0cec Merge pull request #18175 from crosbymichael/arm-doc
Change and move ARM.md doc to project
2015-11-23 13:57:42 -08:00
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
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