0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11094 commits 14 branches 412 tags 338 MiB
Commit graph

11094 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jessica Frazelle
f7b3a6b292 Cleanup errorOut resp in history test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
b59d5a9dd2 Cleanup errorOut resp in info test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
0faf87598f Cleanup errorOut resp in kill test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
17842840ec Cleanup errorOut resp in nat test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
6b858b59ed Cleanup errorOut resp in create test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
475235ba7e Cleanup errorOut resp in tag test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
b645df1d39 Cleanup errorOut resp in export test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
88d65cbdf4 Cleanup errorOut resp in port test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
3182ee5c9b Cleanup errorOut resp in commit test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Cleanup errorOut resp in commit test

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Michael Crosby
2f9ffe5b6a Merge pull request #8232 from vbatts/vbatts-devmapper_getDeps 
devmapper: include dm_deps information in debug
 2014-10-16 14:13:21 -07:00
Michael Crosby
0e67cf0627 Merge pull request #8380 from cpuguy83/moar_names 
Add more names
 2014-10-16 14:04:15 -07:00
Michael Crosby
4b594721c4 Merge pull request #8465 from SvenDowideit/document-device-flag-permission-options 
Add info on --device flag permissions ':rwm'
 2014-10-16 14:00:09 -07:00
Michael Crosby
f0eb1ef4e1 Merge pull request #8526 from vbatts/vbatts-too_many_open_files 
client: even cleaner use of Transport
 2014-10-16 13:53:31 -07:00
Michael Crosby
b3cda9fc7e Merge pull request #8566 from jfrazelle/Cleanup-fmt-%q 
Cleanup: integration-cli ('%s' with %q)
 2014-10-16 13:51:46 -07:00
Victor Vieux
1183abc4aa Merge pull request #8549 from vieux/pkg_units 
add BytesSize in pkg/units
 2014-10-16 13:44:50 -07:00
Michael Crosby
d1aca045b3 Merge pull request #8612 from jfrazelle/8611-ip-masq-iptables 
Setting iptables=false should propagate to ip-masq=false
 2014-10-16 13:35:37 -07:00
Michael Crosby
40a6461d16 Merge pull request #8606 from tianon/release-home 
Fix more missing HOME references
 2014-10-16 12:12:38 -07:00
Michael Crosby
c3237cc9d8 Merge pull request #8608 from crosbymichael/merge_release_v1.3.0 
Merge release v1.3.0
 2014-10-16 12:12:21 -07:00
James Turnbull
3d0d2fd183 Merge pull request #8609 from gesellix/patch-2 
fix minor docs error
 2014-10-16 15:06:00 -04:00
Jessica Frazelle
3893e220e8 Setting iptables=false should propagate to ip-masq=false 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2014-10-16 11:52:14 -07:00
Tobias Gesellchen
143f438e6e fix minor docs error 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
 2014-10-16 19:36:36 +02:00
Michael Crosby
db21b556ce Change version to 1.3.0-dev 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-16 17:22:42 +00:00
Michael Crosby
30806ebc0f Merge branch 'release' into merge_release_v1.3.0 2014-10-16 17:22:27 +00:00
Michael Crosby
c78b920e01 Merge pull request #8323 from crosbymichael/bump_v1.3.0 
Bump to version 1.3.0
 2014-10-16 10:08:54 -07:00
Tianon Gravi
d040de6dd4 Fix more missing HOME references 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-10-16 10:14:26 -06:00
Sven Dowideit
2eb9c0bfd4 Merge pull request #8595 from fredlf/signed-image-doco 
Expanded release notes
 2014-10-15 23:20:14 -07:00
Fred Lifton
74d0485885 Expanded release notes 
Made it clear signed images is a preview feature and added a little more info about how the feature works.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-10-15 16:08:07 -07:00
Michael Crosby
c78088fe3d Bump to version 1.3.0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-15 19:15:24 +00:00
Michael Crosby
87bd2da5d8 Merge branch 'master' into bump_v1.3.0 2014-10-15 19:15:13 +00:00
Michael Crosby
9a82713772 Merge pull request #8578 from erikh/fix_slash 
builder: Handle trailing \ appropriately.
 2014-10-15 12:11:37 -07:00
Alexandr Morozov
abec82bdee Merge pull request #8579 from erikh/builder_html_panic 
builder: handle anything we cannot parse the command for as a fatal error
 2014-10-15 12:01:52 -07:00
Fred Lifton
73792969e6 Merge pull request #8582 from SvenDowideit/api-docs-link-to-basics-page 
The basics page moved, update link.
 2014-10-15 11:34:25 -07:00
Erik Hollensbe
3f2eb353bd builder: provide a friendly message on parser errors 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 18:08:23 +00:00
Fred Lifton
9c6346e9b2 Merge pull request #8583 from SvenDowideit/minimal-curl-command-to-tls-docker-socket 
Add a little info on how to talk to the TLS encrypted Docker Socket
 2014-10-15 11:01:05 -07:00
Alexandr Morozov
de5b1b8bb0 Merge pull request #8580 from erikh/filter_comments_first 
builder: strip blank lines before processing any line continuations.
 2014-10-15 11:00:31 -07:00
Erik Hollensbe
63637b9d27 builder: handle anything we cannot parse the command for as a fatal error. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 08:47:15 +00:00
Erik Hollensbe
96f342f703 builder: comments should also be elided in the middle of statements following a line continuation. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 08:44:14 +00:00
Sven Dowideit
1c68de798f Add a little info on how to talk to the TLS encrypted Docker Socket 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-10-15 17:24:53 +10:00
Sven Dowideit
a64ff0bf7a The basics page moved, update link. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-10-15 16:48:43 +10:00
Erik Hollensbe
a1ef2207dd builder: strip blank lines before processing any line continuations. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 04:00:17 +00:00
Erik Hollensbe
7fa449191c builder: Handle trailing \ appropriately. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 03:08:18 +00:00
Jessica Frazelle
949ab47710 Replace '%s' in test utils 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-14 10:59:38 -07:00
Jessica Frazelle
c091397d51 Replace '%s' in run tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-14 10:59:19 -07:00
Jessica Frazelle
be31a66b7a Replace '%s' in rm tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-14 10:59:11 -07:00
Jessica Frazelle
a44296603f Replace '%s' in diff tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-14 10:59:01 -07:00
Jessica Frazelle
91f33fcaaa Replace '%s' in create tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-14 10:58:35 -07:00
Michael Crosby
dc243c812b Merge pull request #8564 from tiborvass/remove-docker-dot-io 
change docs.docker.io to docs.docker.com in install script
 2014-10-14 10:53:10 -07:00
Tibor Vass
e5e0baa6d4 change docs.docker.io to docs.docker.com in install script 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-14 13:45:26 -04:00
Michael Crosby
a29837020b Merge pull request #8563 from crosbymichael/remove-key-create 
Remove client key.json generation for trust
 2014-10-14 10:45:15 -07:00
Michael Crosby
712e8da885 Remove client key.json generation for trust 
This removes the key generation for trust from main while it is not
being consumed.  The problem is that because this is being set in main
if a user runs as root initially the files will be owned by root.  Later
if the user sets up the docker group they are unable to read the keys.
This is half a user error and documentation problem and the other half
is management.

We decided to remove this code for now while it is not being used and
will revisit it later when the consuming features are added.  A few
options are to generate lazily and provide a clear error message on an
EPERM so that the user knows what is wrong and can correct the
permissions.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-14 17:16:45 +00:00