c6cf978b4b
Merge pull request #8700 from unclejack/install_no_pull
...
contrib/install.sh: remove pull of hello-world
2014-11-04 10:28:43 -07:00
59d4161f69
Merge pull request #8950 from Bertg/patch-1
...
makes the -s --size option documentation clearer
2014-11-04 09:09:15 -08:00
f9d80712d9
contrib/install.sh: remove pull of hello-world
...
This removes the pull of the hello-world image from install.sh to
address privacy concerns.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-04 19:05:47 +02:00
b8678aa7f5
Merge pull request #8946 from unclejack/stream_decode
...
Decode JSON to avoid ReadFile
2014-11-04 09:02:40 -08:00
762ffda95d
makes the -s --size option documentation clearer
2014-11-04 17:49:39 +01:00
a34f31b488
Merge pull request #8871 from tonistiigi/start-wait-hijack
...
Wait for hijack on docker start command
2014-11-04 08:46:56 -08:00
fa59fe997c
Merge pull request #8877 from erikh/proxy_error_check
...
proxy: Fix a potential panic handling error states.
2014-11-04 11:40:02 -05:00
6718791ea2
Merge pull request #8813 from jlhawn/aufs_exclude_on_tar_layer
...
Exclude `.wh..wh.*` AUFS metadata on layer export
2014-11-04 11:38:12 -05:00
edae8830a9
Merge pull request #8906 from dqminh/remove-copy-directory
...
change util.CopyDirectory to archive.CopyWithTar
2014-11-04 08:02:35 -08:00
9eb8fcd58a
Merge pull request #8390 from MalteJ/set-macaddress
...
Adding docker-cli run param to set MAC address
2014-11-04 07:54:59 -08:00
28605bc4d5
enhancing set-macaddress docu #2
...
Signed-off-by: Malte Janduda <mail@janduda.net>
2014-11-04 15:19:47 +01:00
f665be55fe
volume: stream JSON & Decode
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-04 16:15:07 +02:00
4dbbe4f51a
image: stream img JSON & Decode in LoadImage
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-04 16:15:00 +02:00
4bc28f4e6b
daemon/container: stream & decode JSON
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-04 16:14:47 +02:00
b68d7d39bc
Merge pull request #8924 from pdericson/api-doc-fix
...
Fix typo in api docs: stdou -> stdout
2014-11-03 23:09:16 -08:00
5b03a21963
Merge pull request #8799 from jlhawn/remove_jsondata_arg
...
Remove `jsonData` argument from `image.StoreImage`
2014-11-03 20:55:40 -05:00
26184de8ab
Remove `jsonData` argument from `image.StoreImage`
...
The argument specified the json data to save to disk when registering
a new image into the image graph. If it is nil, then the given image
is serialized to json and that is written by default. This default
behavior is sufficient if the given image was originally deserialzed
from this jsonData to begin with which has always been the case.
Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2014-11-03 17:39:21 -08:00
54d6d12556
Merge pull request #8863 from vbatts/vbatts-archive_stat
...
./pkg/archive: clean up Stat_t assertion
2014-11-03 19:14:39 -05:00
b8ab729ae6
Merge pull request #8590 from jfrazelle/8307-iptables-d-restart-fix
...
On daemon shutdown iptables cleanup successfully
2014-11-03 18:29:51 -05:00
a7dea37b78
Merge pull request #8901 from dmcgowan/v2_registry_mirror_check
...
Skip V2 registry and immediately fallback to V1 when mirrors are provided
2014-11-03 13:37:55 -08:00
a85f58719f
Merge pull request #8739 from duglin/CleanupDockerIgnores
...
Do some cleanup on .dockerignore paths
2014-11-03 16:05:24 -05:00
38d3888194
Merge pull request #8932 from duglin/UpdateLogrus
...
Update logrus to the latest so we can use ParseLevel() for PR #8335
2014-11-03 16:00:22 -05:00
8872c2903a
Merge pull request #8907 from icecrime/clarify_user_instruction_doc
...
Clarify USER instruction documentation
2014-11-03 11:58:56 -08:00
a12d897394
Update logrus to v0.6.0 so we can use ParseLevel() for PR #8335
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-03 11:57:30 -08:00
025363848b
Merge pull request #8927 from bfirsh/dont-pass-args-to-help-when-command-doesnt-exist
...
Fix help text being incorrect with multiple args
2014-11-03 11:23:57 -08:00
9ef9bfd151
Merge pull request #8929 from LK4D4/fix_filter_hang
...
Fix deadlock in ps exited filter
2014-11-03 11:07:24 -08:00
03ea2166b6
Fix deadlock in ps exited filter
...
Fixes #8909
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-11-03 10:51:03 -08:00
0e4bf159a2
Merge pull request #8928 from tianon/not-200-chars-anymore
...
Update "official repos" doc to mention 100 char short desc limit
2014-11-03 10:05:39 -08:00
693b9d335c
Update "official repos" doc to mention 100 char short desc limit
...
The Hub no longer accepts short descriptions over 100 characters.
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-11-03 10:12:05 -07:00
ef004ec03f
Fix help text being incorrect with multiple args
...
E.g. "docker foobar run" would have printed "Command not found:
foobar" and printed the help text for "run". It should instead
print the root help message for docker.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-11-03 16:46:01 +00:00
4437573c96
Fix typo in api docs: stdou -> stdout
2014-11-03 10:52:50 +00:00
971fc2253a
enhancing set-macaddress docu
...
Signed-off-by: Malte Janduda <mail@janduda.net>
2014-11-03 11:43:27 +01:00
c0f0f5c988
Do some cleanup on .dockerignore paths
...
While working on the fix for #8330 I noticed a few things:
1 - the split() call for the .dockerignore process will generate a blank
"exclude". While this isn't causing an issue right now, I got worried
that in the future some code later on might interpret "" as something bad,
like "everything" or ".". So I added a check for an empty "exclude"
and skipped it
2 - if someone puts "foo" in their .dockerignore then we'll skip "foo".
However, if they put "./foo" then we won't due to the painfully
simplistic logic of go's filepath.Match algorithm. To help things
a little (and to treat ./Dockerfile just like Dockerfile) I added
code to filepath.Clean() each entry in .dockerignore. It should
result in the same semantic path but ensure that no matter how the
user expresses the path, we'll match it.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-02 11:29:46 -08:00
de9bf24750
Clarify USER instruction documentation
...
Reuse WORKDIR wording to specify that the USER instructions affect the
following RUN, CMD, and ENTRYPOINT instructions.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-11-01 14:04:51 -07:00
e5ecfd3b17
change util.CopyDirectory to archive.CopyWithTar
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-11-01 12:23:08 -04:00
f2df38050e
Adding docker-cli run param to set MAC address
...
Signed-off-by: Malte Janduda <mail@janduda.net>
2014-11-01 15:35:09 +01:00
9d6391a9eb
Skip V2 registry and immediately fallback to V1 when mirrors are provided
...
Since V2 registry does not yet implement mirrors, when mirrors are given automatically fallback to V1 without checking V2 first.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2014-10-31 18:10:48 -07:00
4d4a7b81bf
Merge pull request #8884 from thomasleveil/userguide-so26652877
...
Reword a sentence bringing confusion about docker links
2014-10-31 17:09:16 -07:00
92bb497201
Merge pull request #8167 from brahmaroutu/expose_ports_1834
...
adding support for port ranges on --expose
2014-10-31 16:20:08 -07:00
fd774a818c
adding support for port ranges on --expose
...
Closes #1834
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-10-31 23:06:30 +00:00
9cc71b4597
Merge pull request #8468 from laktek/master
...
Fix URL check in build from Git.
2014-10-31 14:43:21 -07:00
7cb12133ae
Merge pull request #8818 from coolljt0725/fix_exec_help
...
Fix docker exec help messages.
2014-10-31 14:36:01 -07:00
a92393bb17
Merge pull request #8878 from thaJeztah/patch-1
...
Typo in 1.3.1 change log
2014-10-31 14:32:25 -07:00
058aa0cbc2
Merge pull request #8894 from vieux/fix_docs_filter
...
add missing 'current filter' to ps
2014-10-31 14:26:29 -07:00
7a2dc8b889
Merge pull request #8895 from erikh/proxy_udp_size
...
pkg/proxy: Bump the maximum size of a UDP packet.
2014-10-31 13:11:54 -07:00
5a73be8e9f
pkg/proxy: Bump the maximum size of a UDP packet.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-31 18:56:07 +00:00
f95d73dfd4
add missing 'current filter' to ps
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-10-31 18:28:10 +00:00
0f9f5f3fdf
Merge pull request #8839 from irachex/dns-search-doc
...
Add docs for --dns-search=.
2014-10-31 11:25:57 -07:00
906985123a
Reword a sentence bringing confusion about docker links
...
As [discovered][1] doing user support, the sentence `You've learned that a link creates a
source container that can provide information about itself to a recipient container` brings
confusion.
[1]: http://stackoverflow.com/questions/26652877/how-to-avoid-redundant-container-linking-in-docker-when-propagating-ip-addresses/26654203?noredirect=1#comment41945048_26654203
Signed-off-by: Thomas LEVEIL <thomasleveil@gmail.com>
2014-10-31 13:00:59 +00:00
29965246a7
Typo in 1.3.1 change log
...
Replaced envrionment -> environment
Signed-off-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
2014-10-31 08:31:20 +01:00
Tianon Gravi
Solomon Hykes
unclejack
Alexandr Morozov
Bert Goethals
Jessie Frazelle
Tibor Vass
Arnaud Porterie
Malte Janduda
Sven Dowideit
Josh Hawn
Michael Crosby
Fred Lifton
Doug Davis
Alexandr Morozov
Ben Firshman
Peter Ericson
Arnaud Porterie
Daniel, Dao Quang Minh
Derek McGowan
Srini Brahmaroutu
Erik Hollensbe
Victor Vieux
Thomas LEVEIL
Sebastiaan van Stijn