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
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
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
eaa050fdb8
Mapping change in code
...
Signed-off-by: Huayi Zhang <irachex@gmail.com>
2014-10-31 09:57:54 +08:00
107898a773
Merge pull request #8837 from sawalls/patch-2
...
ubuntulinux.md - old commands, typo, section movement
2014-10-30 18:48:24 -07:00
d8b17d785a
Fix docker exec command help messages
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2014-10-31 09:36:07 +08:00
c2ff42552a
Merge pull request #8873 from SvenDowideit/de-cleanup-Dockerfile
...
Yes, the review really should have picked up this spelling mistake
2014-10-30 18:32:28 -07:00
bc62a35ffb
ubuntulinux.md - old commands, typo, section movement
...
- Removed some commands related to autocomplete/symlinks that don't seem to be required anymore on Ubuntu 14.04
- Fixed one minor typo ("see LINK _for_ details," not "see LINK details")
- Moved section "Giving non-root access" to top level, rather than being under Ubuntu 13 (the section isn't specific to Ubuntu 13, and even references Ubuntu 14).
Signed-off-by: Scott Walls <sawalls@umich.edu>
2014-10-30 18:28:37 -07:00
bfe21f095d
Yes, the review really should have picked up this spelling mistake
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-31 11:10:17 +10:00
f68b8b33e6
Merge pull request #8850 from shuai-z/clean-mount
...
Clear the internal state before raising error.
2014-10-30 18:01:01 -07:00
aca253d6d0
Merge pull request #8866 from tonistiigi/fix-8832-logs-panic
...
Fix panic on slow log consumer.
2014-10-30 17:40:46 -07:00
793fb26bff
Merge pull request #8510 from hqhq/graphdriver_bug
...
daemon: resolve the graphdriver to show
2014-10-30 17:40:30 -07:00
6d6dc2c1a1
Merge pull request #8870 from tiborvass/merge_release_v1.3.1
...
Merge release v1.3.1
2014-10-30 20:24:34 -04:00
b9fcdb8191
Change version to 1.3.1-dev
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-10-30 19:45:07 -04:00
4a17e6eedd
Bump to version v1.3.1
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Conflicts:
VERSION
2014-10-30 19:44:54 -04:00
05c18a2434
Fix login command
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-10-30 19:44:44 -04:00
e43d9f713e
Docs edits for dropping SSLv3 and under + release notes for 1.3.1
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Conflicts:
docs/sources/index.md
Conflicts:
docs/sources/index.md
2014-10-30 19:44:42 -04:00
6a1ff022b0
Do not verify certificate when using --insecure-registry on an HTTPS registry
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Conflicts:
registry/registry.go
registry/registry_test.go
registry/service.go
registry/session.go
Conflicts:
registry/endpoint.go
registry/registry.go
2014-10-30 19:44:09 -04:00
afade4236d
Don't hard code true for auth job
...
Signed-off-by: Michael Crosby <michael@docker.com>
Conflicts:
registry/service.go
2014-10-30 19:41:55 -04:00
48f7384d63
Expand documentation for --insecure-registries
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-10-30 19:41:55 -04:00
f29b2e48eb
Refactor IsSecure change
...
Fix issue with restoring the tag store and setting static configuration
from the daemon. i.e. the field on the TagStore struct must be made
internal or the json.Unmarshal in restore will overwrite the insecure
registries to be an empty struct.
Signed-off-by: Michael Crosby <michael@docker.com>
Conflicts:
graph/pull.go
graph/push.go
graph/tags.go
2014-10-30 19:41:55 -04:00
380c8320a7
make http usage for registry explicit
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Conflicts:
daemon/config.go
daemon/daemon.go
graph/pull.go
graph/push.go
graph/tags.go
registry/registry.go
registry/service.go
2014-10-30 19:41:55 -04:00
28af4a1efb
Merge pull request #8867 from vbatts/vbatts-relocate_mount_operation
...
mount: move the MakePrivate to pkg/mount
2014-10-30 16:39:20 -07:00
930a756ad5
mount: move the MakePrivate to pkg/mount
...
The logic is unrelated to graphdriver.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-10-30 17:04:56 -04:00
c2cf97a074
Fix panic on slow log consumer.
...
Fixes #8832
All stdio streams need to finish writing before the
connection can be closed.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
2014-10-30 22:24:57 +02:00
c3762c3abf
Merge pull request #8822 from wilsaj/patch-2
...
Update host integration article
2014-10-30 12:19:36 -07:00
d0197f4f7e
Merge pull request #8856 from unclejack/reexec_pkg
...
pkg/reexec: move reexec code to a new package
2014-10-30 12:14:37 -07:00
417e48e4a0
Generalize consumeSlow and add stop support
...
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
2014-10-30 21:11:33 +02:00
Tibor Vass
Fred Lifton
Doug Davis
Michael Crosby
Alexandr Morozov
Tianon Gravi
Ben Firshman
Arnaud Porterie
Jessie Frazelle
Srini Brahmaroutu
Erik Hollensbe
Victor Vieux
Thomas LEVEIL
Sebastiaan van Stijn
Huayi Zhang
Sven Dowideit
Lei Jitang
Scott Walls
Sven Dowideit
Michael Crosby
unclejack
Victor Vieux
Vincent Batts
Tonis Tiigi