c5eb072fd3
Fix breakouts from git root during build
...
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7f7ebeffe81760e2e0a711eb480dd0e0e8cf24dc
Component: engine
2015-06-01 22:10:55 +03:00
16cea00893
Merge pull request #13560 from Microsoft/10662-statscollector
...
Windows: Factor out stat collector
Upstream-commit: 24fbcffeac39280292fe57a8564423332e975b96
Component: engine
2015-06-01 11:39:19 -07:00
817ca1be2f
Merge pull request #13637 from LK4D4/remove_debug
...
Remove useless debug message
Upstream-commit: d156bc9dd44e6a3beacafce8be4f809c1b980998
Component: engine
2015-06-01 11:38:05 -07:00
8354ab7272
Remove useless debug message
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f1b59d64d21d5a0f54536b26161a31441697ca61
Component: engine
2015-06-01 11:15:15 -07:00
c86ef1ca0b
Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage
...
Add docker stats --no-stream show cpu usage
Upstream-commit: a7005c44b5ddfd44c2a54c6d60af52e3fecfaf72
Component: engine
2015-06-01 09:40:04 -07:00
f9a83491c5
Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices
...
Fixes issue #10184 .
Upstream-commit: 6fb454b9f08249449a343ca56348b02ae41ac9c5
Component: engine
2015-06-01 09:30:04 -07:00
c1e042a6e9
Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
...
fix release script for experimental
Upstream-commit: d37aad170ffe75eeaaea07d52863a6159417e5d6
Component: engine
2015-06-01 12:29:45 -04:00
880a570854
Merge pull request #13523 from moxiegirl/carry-12572-fix
...
Updating after the pr went through
Upstream-commit: 7c190b95564d76fe54a91f498306b90132f29a1f
Component: engine
2015-06-01 09:21:12 -07:00
aa1b60b2be
Updating after the pr went through
...
Updating with comments.
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 3ce27975413a06a76dbdf720aadecf7f04fb6bba
Component: engine
2015-06-01 09:20:31 -07:00
c0aec76e55
Windows: Factor out stat collector
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 68c879406bffe772c83643a97a3b1a6e4fba967d
Component: engine
2015-06-01 09:11:03 -07:00
faaf604f3f
Merge pull request #13615 from gesellix/docs-container-create-start
...
indicate HostConfig to be used for "create container"
Upstream-commit: 09bfbfd74e6ec60468dc06962468797d3fc9a884
Component: engine
2015-06-01 17:46:32 +02:00
d27d17578c
Merge pull request #13390 from mrjana/cnm_integ
...
Do not attempt releasing network when not attached to any network
Upstream-commit: b4450043641ffbe8d8b0b5255de99ae0e78141b2
Component: engine
2015-06-01 08:25:20 -07:00
07b08a29ca
indicate HostConfig to be used for "create container"
...
Closes #13614
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 16e649c589ce60ba56812a8fffb98aee34fceb94
Component: engine
2015-06-01 07:04:41 +02:00
b994ee0296
Merge pull request #13622 from jogo/spelling
...
Fix spelling mistakes in documentation
Upstream-commit: 4caa9392f8aa4e57bfe43880b5f67d15b00ed8a7
Component: engine
2015-06-01 11:37:48 +10:00
7716bbfe5b
Fix spelling mistakes in documentation
...
While reading some of the docs I noticed a few errors, so I ran
misspellings (https://pypi.python.org/pypi/misspellings ) on markdown files
Signed-off-by: Joe Gordon <joe.gordon0@gmail.com >
Upstream-commit: 3d87b80b46d45c2ca7c0fbcbcbb3fcf97a48444b
Component: engine
2015-05-31 11:53:23 -07:00
39e349ea73
Merge pull request #13460 from moxiegirl/add-created-state-diagram
...
Updating event diagram with the created state. Cool, thank you.
Upstream-commit: 093f57a26134c262b14de801dd577fbce93ad664
Component: engine
2015-05-30 19:47:24 -07:00
d3e3277a8e
Merge pull request #13603 from tianon/consistent-dest
...
Make "DEST" a make.sh construct instead of ad-hoc
Upstream-commit: 0ea14e5c6d5cd731715b53f6971faef45cd06cd3
Component: engine
2015-05-30 16:42:10 -07:00
858743b549
Merge pull request #13616 from konstruktoid/docs_openssl
...
Docs: sha256 and 4096 when using openssl
Upstream-commit: 73683e807de28e0236689b7b129bf3e335e76231
Component: engine
2015-05-30 19:20:21 -04:00
f410793dcf
aes256 and 4096 bits
...
squashing down to a single commit and change back to cert.pem
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com >
Upstream-commit: 5cd64cb93fe64c6ab7b22ef3dbe4ea06ef5e79b9
Component: engine
2015-05-31 01:05:49 +02:00
c50b83a729
Make "DEST" a make.sh construct instead of ad-hoc
...
Using "DEST" for our build artifacts inside individual bundlescripts was already well-established convention, but this officializes it by having `make.sh` itself set the variable and create the directory, also handling CYGWIN oddities in a single central place (instead of letting them spread outward from `hack/make/binary` like was definitely on their roadmap, whether they knew it or not; sneaky oddities).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: ac3388367b6493987cef8017774fa4cdb5d2098f
Component: engine
2015-05-30 11:16:43 -07:00
f605824756
Merge pull request #13367 from duglin/Issue13353
...
Add a "Created" state for new containers that haven't been run yet
Upstream-commit: f2154a5a6b2d68258322a9a0677e14b910e7b47d
Component: engine
2015-05-30 19:49:38 +02:00
adc8e86b26
Add docker stats --no-stream show cpu usage
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 96123a1fd5c2779ccd7dd722a1fa4196e91dd716
Component: engine
2015-05-31 01:25:51 +08:00
cc848c594e
Add a "Created" state for new containers that haven't been run yet
...
Closes #13353
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: dc697b1c9f2bf77b5b78aa871e3f365e333fd253
Component: engine
2015-05-30 07:48:46 -07:00
a5d38e0b03
Merge pull request #13580 from vdemeester/update-api-commit
...
Update api documentation to add labels in commit
Upstream-commit: 279c8774519de0c832c555252770b9368fea5a32
Component: engine
2015-05-30 14:44:05 +02:00
715cb4d503
Merge pull request #13612 from duglin/DocsNewLine
...
Premature newline insertions
Upstream-commit: 18c11dc264aa68129e10a0f60d807b4c5000055b
Component: engine
2015-05-30 08:33:46 -04:00
3babe9504e
Premature newline insertions
...
Noticed that there were a few newlines in the middle of a \`...\` blocks that
made the text look funny when displayed in HTML.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: e51b3111299bb854b0eb59a26884822e59e09903
Component: engine
2015-05-30 04:46:24 -07:00
77c76a3170
Update api documentation to add labels in commit
...
It is already possible to set labels at commit when using the API. But
it is not present in the API documentation. Added an integration test
too, to validate this work (and will be in the future).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c61fa8471a567b4890e0861f8aaff91a68c42e4f
Component: engine
2015-05-30 11:31:51 +02:00
64ffe806a7
Fix issue #10184 .
...
Merge user specified devices correctly with default devices.
Otherwise the user specified devices end up without permissions.
Signed-off-by: David R. Jenni <david.r.jenni@gmail.com >
Upstream-commit: c913c9921b7caa11e8500d2ebb4fa97303c876be
Component: engine
2015-05-30 11:09:47 +02:00
4610cc7a2b
Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown
...
Ensure all the running containers are killed on daemon shutdown
Upstream-commit: 04c6f09fbdf60c7765cc4cb78883faaa9d971fa5
Component: engine
2015-05-29 16:45:57 -07:00
4d18604a08
Merge pull request #13561 from icecrime/warn_overlay_docs
...
Add note about overlay not being production ready
Upstream-commit: 1613897d2dcc875096eac669532643b8d2c0c1f0
Component: engine
2015-05-30 01:24:02 +02:00
a95cc9c362
Merge pull request #13606 from runcom/revert-doc-in-api-1-19
...
Revert api doc for 1.19 about PortSpecs removal
Upstream-commit: 3aa4a3a0c5018bd46d422a00aa8a1f7ff352fdbd
Component: engine
2015-05-29 15:42:56 -07:00
b0be6943f7
Revert api doc for 1.19 about PortSpecs removal
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c42ede311b4fa5dd887c79d5ea2930e07f4f5f11
Component: engine
2015-05-30 00:32:03 +02:00
a03d351804
Merge pull request #13596 from jfrazelle/11414-fix-once-and-for-all
...
fix bug with rmi multiple tag
Upstream-commit: eaa9c1b97e3b28c6e2a16c7e593238bb43e1f9dc
Component: engine
2015-05-29 15:10:22 -07:00
4f53f1bb13
Merge pull request #13425 from runcom/13421-stats-default-stream
...
Fix regression in stats API endpoint
Upstream-commit: 4389fc8bf975a5df567c8431dda82d19a09733a3
Component: engine
2015-05-29 15:05:21 -07:00
9b9477d660
Merge pull request #13567 from draghuram/apiver
...
Make the version mismatch message more explicit.
Upstream-commit: d79654d0f67c88ceb6b6c2747a2402d248ecea45
Component: engine
2015-05-29 23:39:48 +02:00
b68a27ad2e
Merge pull request #13601 from tianon/precise
...
Finally add precise/12.04 as a build-deb target
Upstream-commit: d96ca04f249e19c2d259052371a026ae4d48a3a1
Component: engine
2015-05-29 14:35:07 -07:00
277284056b
Merge pull request #13446 from runcom/remove-PortSpecs
...
Remove PortSpecs from Config
Upstream-commit: ec167972bf15db8861eed8912b791a4aa9bb9efa
Component: engine
2015-05-29 14:31:48 -07:00
7112e31245
Merge pull request #13604 from tianon/vim-embedded-shell
...
Add embedded shell script highlight to vim syntax
Upstream-commit: 4d9191e15d457adaa9f7721828ee06cd6eb51b1d
Component: engine
2015-05-29 14:17:07 -07:00
6f2ef90bf2
Merge pull request #13605 from tianon/vim-dockerfile
...
Adjust vim ftdetect to match "Dockerfile", "dockerfile", and "Dockerfile.*" which are all reasonably safe to assume "this is a Dockerfile"
Upstream-commit: e2524d8ace359497e9e02eaa90c3d36ef6c36508
Component: engine
2015-05-29 14:16:50 -07:00
7d3e38efca
Merge pull request #13527 from duglin/FixImagesPrefixNotFound
...
Fix error when trying to delete an image due to a bad container
Upstream-commit: a39de418719dc6189025a760ca6b5c024a177b24
Component: engine
2015-05-29 14:09:26 -07:00
9712652e10
fix bug with rmi multiple tag
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 185f392691c40fc4cb6ea16373a92a03f3d0b0f2
Component: engine
2015-05-29 14:04:06 -07:00
1efd411c44
Merge pull request #13577 from WeiZhang555/httpClose
...
bug fix: close http response body no longer in use
Upstream-commit: 1680c78e630611a968b24a7064b1a1cd80614d75
Component: engine
2015-05-29 16:59:17 -04:00
03bef78b33
Merge pull request #13578 from WeiZhang555/errRet
...
return error when failed to read http response body
Upstream-commit: 8d726709ad1479693c3c326fd69b432799b82192
Component: engine
2015-05-29 16:57:27 -04:00
eafc23fd4d
Add note about overlay not being production ready
...
Add a paragraph in cli.md mentioning that overlay is not a production
ready graphdriver.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 67cb748e26c3b6979983493f307a38b59e291642
Component: engine
2015-05-29 13:53:09 -07:00
4b65abde07
Adjust vim ftdetect to match "Dockerfile", "dockerfile", and "Dockerfile.*" which are all reasonably safe to assume "this is a Dockerfile"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: e02744404d34027d1b358986bedd8557805aae58
Component: engine
2015-05-29 13:46:51 -07:00
b8a51baa80
Add embedded shell script highlight to vim syntax
...
This highlights `RUN`, `CMD`, and `ENTRYPOINT` lines using shell highlighting. It doesn't bother detecting the JSON forms, but that's OK because JSON arrays highlight pretty reasonably with shell highlights. :)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 62d3b1bf2e830b6cdf7c4df86d356d48b58b1ab0
Component: engine
2015-05-29 13:39:37 -07:00
2b62e414ad
Fix regression in stats API endpoint where stream query param default is true
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ec97f414657189f2ce95d6b5bda26aa9d206b705
Component: engine
2015-05-29 22:38:36 +02:00
d7b3086241
Merge pull request #13589 from vdemeester/pkg-stringutils-test-coverage
...
Add test coverage for pkg/stringutils
Upstream-commit: 3b831a2f3af01727ba91fc52c31c6682eeef69b3
Component: engine
2015-05-29 13:38:12 -07:00
6226136075
Remove PortSpecs from Config
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 15134a3320fbacee36e86a0342e7ffb49285f297
Component: engine
2015-05-29 22:38:09 +02:00
24139366a7
Merge pull request #13564 from burke/fix-memory-leak
...
Use bufio.Reader instead of bufio.Scanner for logger.Copier
Upstream-commit: c42810fe9981c07e7de55aa65af44d618dd4e6ce
Component: engine
2015-05-29 13:37:15 -07:00
