Commit Graph

14806 Commits

Author SHA1 Message Date
93fe2d99ac test: Skip TestDevicePermissions on lxc
Closes: #13641

Signed-off-by: Zefan Li <lizefan@huawei.com>
Upstream-commit: e55649192ef9c947e9c90018c71bbc0a8d99a546
Component: engine
2015-06-02 10:27:54 +08:00
46b7d97a6b Merge pull request #13651 from RichardScothern/v1-mirror-fix
Fallback to pull from hub if mirrors unavailable.
Upstream-commit: 1f903f652cd7e897c7adbbb0116a9e08d8552987
Component: engine
2015-06-01 21:09:54 -04:00
d43db5f8e1 Merge pull request #13644 from mchiang0610/patch-1
Fix - Download button does not download
Upstream-commit: cd79751cfa8d2554923d0cf29216504d660b0a70
Component: engine
2015-06-01 17:33:38 -07:00
f6a914544f Merge pull request #13609 from Microsoft/10662-refixserverwindows
Windows: Fix windows to match linux after compile break
Upstream-commit: 05b1d02423179a32d9fed4f786af125054caec4c
Component: engine
2015-06-01 17:03:13 -07:00
25eb4c5026 Merge pull request #13611 from duglin/Issue13417a
Allow .dockerignore to ignore everything
Upstream-commit: aa8d8fdc0cfe07ce4e4976dc41a3fdb86ebcfc66
Component: engine
2015-06-01 15:59:57 -07:00
07eda82273 Merge pull request #13536 from Mic92/master
remove redundant mount/unmount calls on commit
Upstream-commit: 1f472c37687fd1f66e574df3ba773fde5be57e2d
Component: engine
2015-06-01 15:57:14 -07:00
ab7b79c3a9 Merge pull request #13597 from sanketsaurav/master
Proposing Bose, Raman and Ramanujan
Upstream-commit: f358b39521db8ea2836b3df1b2cb9df41534f42a
Component: engine
2015-06-01 15:56:16 -07:00
8ce2553351 If no endpoint could be established with the given mirror configuration,
fallback to pulling from the hub as per v1 behavior.

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
Upstream-commit: 6e4ff1bb13c82fd530b27c85ae9b0ca476cddfcd
Component: engine
2015-06-01 15:18:56 -07:00
877a921af1 Merge pull request #13643 from LK4D4/fix_registry_race
Fix race condition in registry/session
Upstream-commit: 488c355d9499fd1b8b24d8ec3a8004475c095ffa
Component: engine
2015-06-01 14:44:12 -07:00
f85b8fb4db Merge pull request #13638 from icecrime/maintainers_add_calavera
Add @calavera to maintainers
Upstream-commit: b7101d528de3952754246b62596ac7a4bb3b3349
Component: engine
2015-06-01 14:05:12 -07:00
85e6643580 Merge pull request #13443 from duglin/CleanupEvents
Cleanup container LogEvent calls
Upstream-commit: cd80a61cc1dd6868eef77852b898f1d25c06641b
Component: engine
2015-06-01 14:04:33 -07:00
912b96c23e Fix - Download button does not download
Fix - Download button does not download

Users got confused when Kitematic is not being downloaded after clicking on the download button, and instead got brought to a screen to teach them how to download Kitematic.

The additional step caused a significant drop in Kitematic downloads. This pull request fixes the issue, to allow users to directly download Kitematic after clicking on the Download button. 

Signed-off-by: Michael Chiang <michael.chiang@docker.com>
Upstream-commit: 5606f32eecc1c9befde331ecc5b653ee4423d020
Component: engine
2015-06-01 13:29:44 -07:00
a965e4e763 Fix race condition in registry/session
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 9d98c28855035ba1a968f2031f50302d0c41e208
Component: engine
2015-06-01 13:25:18 -07:00
869144dea2 Merge pull request #13639 from tonistiigi/fix-git-escape
Make sure git remote subdirs don't escape git root
Upstream-commit: 64a74316634b75dd406673ebaba15eb2bbd96d11
Component: engine
2015-06-01 13:04:39 -07:00
fcc50c1993 Merge pull request #13557 from ewindisch/apparmor-unshare-priv
Expand unshare test to include privileged test
Upstream-commit: 71d960d4559cdbae4ff7913441685f29279a1ca2
Component: engine
2015-06-01 15:43:37 -04:00
4f79291859 Cleanup container LogEvent calls
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.

Added testcases for new events: commit, copy, resize, attach, rename, top

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8232312c1e705753d3db82dca3d9bb23e59c3b52
Component: engine
2015-06-01 12:39:28 -07:00
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
d73c700621 Add @calavera to maintainers
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 62afcbc6d45e6ecd3a03646712a5ea748334136b
Component: engine
2015-06-01 12:02:12 -07: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
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
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
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
1d47fe7076 Allow .dockerignore to ignore everything
Change CLI error msg because it was too specific and didn't make sense
when there were errors not related to inaccessible files.

Removed some log.Error() calls since they're not really errors we should
log. Returning the error will be enough.

Closes: #13417

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 82ea6ed2bc33ac1ec2ad2bd8d4a098031dd77095
Component: engine
2015-05-30 04:16:00 -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
0b80863b93 Windows: Refix server_windows to match linux
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2b7569ccc359a1925dbf48f88a2f2a61c277bc32
Component: engine
2015-05-29 21:25:27 -07: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
51fe79ab35 Proposing Bose, Raman and Ramanujan
Signed-off-by: Sanket Saurav <sanketsaurav@gmail.com>
Upstream-commit: a18c0b3b3c77f7e4be892e4f8b27ae5283fbf6fd
Component: engine
2015-05-30 04:14:11 +05:30
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