Jeffrey Morgan
7abd94fc30
Fix bug where require lookup of classNames would fail because of the capital N
2015-05-30 23:39:23 -07:00
Evan Hazlett
eb5729d9e1
Merge pull request #1276 from hairyhenderson/amazonec2-spot-instance-monitoring-fix
...
Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot requests
2015-05-30 23:02:21 -04: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
Dave Henderson
904acb914a
Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot requests
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
2015-05-30 22:25:36 -04:00
Philip Misiowiec
1f31f595d9
fixed typos
...
Signed-off-by: Phil Misiowiec <phil.misiowiec@atlashealth.com >
2015-05-30 18:22:41 -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
Lei Jitang
20927ffbe7
Correct the error message of pause and unpause non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-31 03:32:29 +08:00
Aidan Hobson Sayers
a121ac858e
Restore DEBUG as DOCKER_DEBUG (removed in #10665 ), add as make variable
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
2015-05-30 19:37:36 +01: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
Daniel Nephin
9a0bb325f2
Merge pull request #1481 from albers/completion-smart-recreate
...
Support --x-smart-recreate in bash completion
2015-05-30 09:01:39 -05:00
Daniel Nephin
d64bf88e26
Merge pull request #1475 from fordhurley/patch-1
...
Fix markdown formatting for `--service-ports` example
2015-05-30 08:43:48 -05: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
Xian Chaobo
78957d527b
add load unit test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-29 22:44:27 -04:00
Xian Chaobo
def00ea0a0
fix load
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-29 22:35:27 -04:00
Stephen Day
318af0b1ce
Merge pull request #443 from gierschv/driver-rados
...
Storage Driver: Ceph Object Storage (RADOS)
2015-05-29 18:10:49 -07:00
Stephen Day
63d2e51529
Merge pull request #540 from konstruktoid/patch-1
...
sha256 when generating certificates
2015-05-29 17:09:26 -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
Victor Vieux
ec784bd100
add initial version of mesos/cluster_test.go
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-05-29 15:07:04 -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
Jessica Frazelle
185f392691
fix bug with rmi multiple tag
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-29 14:04:06 -07:00
Phil Estes
1680c78e63
Merge pull request #13577 from WeiZhang555/httpClose
...
bug fix: close http response body no longer in use
2015-05-29 16:59:17 -04:00
Phil Estes
8d726709ad
Merge pull request #13578 from WeiZhang555/errRet
...
return error when failed to read http response body
2015-05-29 16:57:27 -04:00
Arnaud Porterie
67cb748e26
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 >
2015-05-29 13:53:09 -07:00
Tianon Gravi
e02744404d
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 >
2015-05-29 13:46:51 -07:00
Tianon Gravi
62d3b1bf2e
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 >
2015-05-29 13:39:37 -07:00