clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,984 Commits 9 Branches 112 Tags
85fffe1341fc4e957a9a40dbc3cedded8cb44e70
Commit Graph
15984 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen J Day 84413be3c9 Break down loadManifest function into constituent parts 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-06-01 13:02:50 -07:00
Phil Estes 71d960d455 Merge pull request #13557 from ewindisch/apparmor-unshare-priv 
Expand unshare test to include privileged test
 2015-06-01 15:43:37 -04:00
Doug Davis 8232312c1e 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>
 2015-06-01 12:39:28 -07:00
Tonis Tiigi 7f7ebeffe8 Fix breakouts from git root during build 
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com>
 2015-06-01 22:10:55 +03:00
Arnaud Porterie 62afcbc6d4 Add @calavera to maintainers 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-06-01 12:02:12 -07:00
Alexander Morozov 24fbcffeac Merge pull request #13560 from Microsoft/10662-statscollector 
Windows: Factor out stat collector
 2015-06-01 11:39:19 -07:00
Brian Goff d156bc9dd4 Merge pull request #13637 from LK4D4/remove_debug 
Remove useless debug message
 2015-06-01 11:38:05 -07:00
Alexander Morozov f1b59d64d2 Remove useless debug message 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-01 11:15:15 -07:00
Brian Goff a7005c44b5 Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage 
Add docker stats --no-stream show cpu usage
 2015-06-01 09:40:04 -07:00
David Calavera 6fb454b9f0 Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices 
Fixes issue #10184.
 2015-06-01 09:30:04 -07:00
Phil Estes d37aad170f Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental 
fix release script for experimental
 2015-06-01 12:29:45 -04:00
moxiegirl 7c190b9556 Merge pull request #13523 from moxiegirl/carry-12572-fix 
Updating after the pr went through
 2015-06-01 09:21:12 -07:00
Mary Anthony 3ce2797541 Updating after the pr went through 
Updating with comments.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-01 09:20:31 -07:00
John Howard 68c879406b Windows: Factor out stat collector 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-01 09:11:03 -07:00
Sebastiaan van Stijn 09bfbfd74e Merge pull request #13615 from gesellix/docs-container-create-start 
indicate HostConfig to be used for "create container"
 2015-06-01 17:46:32 +02:00
Brian Goff b445004364 Merge pull request #13390 from mrjana/cnm_integ 
Do not attempt releasing network when not attached to any network
 2015-06-01 08:25:20 -07:00
Tobias Gesellchen 16e649c589 indicate HostConfig to be used for "create container" 
Closes #13614

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
 2015-06-01 07:04:41 +02:00
Sven Dowideit 4caa9392f8 Merge pull request #13622 from jogo/spelling 
Fix spelling mistakes in documentation
 2015-06-01 11:37:48 +10:00
Joe Gordon 3d87b80b46 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>
 2015-05-31 11:53:23 -07:00
moxiegirl 093f57a261 Merge pull request #13460 from moxiegirl/add-created-state-diagram 
Updating event diagram with the created state. Cool, thank you.
 2015-05-30 19:47:24 -07:00
Jessie Frazelle 0ea14e5c6d Merge pull request #13603 from tianon/consistent-dest 
Make "DEST" a make.sh construct instead of ad-hoc
 2015-05-30 16:42:10 -07:00
James Turnbull 73683e807d Merge pull request #13616 from konstruktoid/docs_openssl 
Docs: sha256 and 4096 when using openssl
 2015-05-30 19:20:21 -04:00
Thomas Sjögren 5cd64cb93f 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>
 2015-05-31 01:05:49 +02:00
Tianon Gravi ac3388367b 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>
 2015-05-30 11:16:43 -07:00
Sebastiaan van Stijn f2154a5a6b Merge pull request #13367 from duglin/Issue13353 
Add a "Created" state for new containers that haven't been run yet
 2015-05-30 19:49:38 +02:00
Lei Jitang 96123a1fd5 Add docker stats --no-stream show cpu usage 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-31 01:25:51 +08:00
Doug Davis dc697b1c9f Add a "Created" state for new containers that haven't been run yet 
Closes #13353

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-30 07:48:46 -07:00
Sebastiaan van Stijn 279c877451 Merge pull request #13580 from vdemeester/update-api-commit 
Update api documentation to add labels in commit
 2015-05-30 14:44:05 +02:00
James Turnbull 18c11dc264 Merge pull request #13612 from duglin/DocsNewLine 
Premature newline insertions
 2015-05-30 08:33:46 -04:00
Doug Davis e51b311129 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>
 2015-05-30 04:46:24 -07:00
Doug Davis 82ea6ed2bc 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>
 2015-05-30 04:16:00 -07:00
Vincent Demeester c61fa8471a 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>
 2015-05-30 11:31:51 +02:00
David R. Jenni c913c9921b 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>
 2015-05-30 11:09:47 +02:00
John Howard 2b7569ccc3 Windows: Refix server_windows to match linux 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-29 21:25:27 -07:00
David Calavera 04c6f09fbd Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown 
Ensure all the running containers are killed on daemon shutdown
 2015-05-29 16:45:57 -07:00
Stephen J Day 74528be903 Add tests for loadManifest digest verification 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-05-29 16:30:21 -07:00
Sebastiaan van Stijn 1613897d2d Merge pull request #13561 from icecrime/warn_overlay_docs 
Add note about overlay not being production ready
 2015-05-30 01:24:02 +02:00
Sanket Saurav a18c0b3b3c Proposing Bose, Raman and Ramanujan 
Signed-off-by: Sanket Saurav <sanketsaurav@gmail.com>
 2015-05-30 04:14:11 +05:30
Jessie Frazelle 3aa4a3a0c5 Merge pull request #13606 from runcom/revert-doc-in-api-1-19 
Revert api doc for 1.19 about PortSpecs removal
 2015-05-29 15:42:56 -07:00
Antonio Murdaca c42ede311b Revert api doc for 1.19 about PortSpecs removal 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-30 00:32:03 +02:00
Stephen J Day 1e653ab645 Attempt to retain tagging behavior 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-05-29 15:20:37 -07:00
Stephen J Day 06612cc0fe Properly verify manifests and layer digests on pull 
To ensure manifest integrity when pulling by digest, this changeset ensures
that not only the remote digest provided by the registry is verified but also
that the digest provided on the command line is checked, as well. If this check
fails, the pull is cancelled as with an error. Inspection also should that
while layers were being verified against their digests, the error was being
treated as tech preview image signing verification error. This, in fact, is not
a tech preview and opens up the docker daemon to man in the middle attacks that
can be avoided with the v2 registry protocol.

As a matter of cleanliness, the digest package from the distribution project
has been updated to latest version. There were some recent improvements in the
digest package.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-05-29 15:20:28 -07:00
David Calavera eaa9c1b97e Merge pull request #13596 from jfrazelle/11414-fix-once-and-for-all 
fix bug with rmi multiple tag
 2015-05-29 15:10:22 -07:00
David Calavera 4389fc8bf9 Merge pull request #13425 from runcom/13421-stats-default-stream 
Fix regression in stats API endpoint
 2015-05-29 15:05:21 -07:00
Antonio Murdaca d79654d0f6 Merge pull request #13567 from draghuram/apiver 
Make the version mismatch message more explicit.
 2015-05-29 23:39:48 +02:00
Jessie Frazelle d96ca04f24 Merge pull request #13601 from tianon/precise 
Finally add precise/12.04 as a build-deb target
 2015-05-29 14:35:07 -07:00
David Calavera ec167972bf Merge pull request #13446 from runcom/remove-PortSpecs 
Remove PortSpecs from Config
 2015-05-29 14:31:48 -07:00
Jessie Frazelle 4d9191e15d Merge pull request #13604 from tianon/vim-embedded-shell 
Add embedded shell script highlight to vim syntax
 2015-05-29 14:17:07 -07:00
Jessie Frazelle e2524d8ace 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"
 2015-05-29 14:16:50 -07:00
Jessie Frazelle a39de41871 Merge pull request #13527 from duglin/FixImagesPrefixNotFound 
Fix error when trying to delete an image due to a bad container
 2015-05-29 14:09:26 -07:00