Commit Graph

12199 Commits

Author SHA1 Message Date
Fred Lifton 5df189a1b0 Merge pull request #9682 from SvenDowideit/scottstamp-stale-links-pr-carry
Scottstamp stale links pr carry
2014-12-17 16:03:55 -08:00
Michael Crosby f1562ac658 Merge pull request #9715 from brahmaroutu/gccgo_power1
Fix to avoid a compile error due to float to int truncation with GCCGO
2014-12-17 16:02:27 -08:00
Sven Dowideit 1f9b6fedca Merge pull request #9717 from SvenDowideit/redirect-opensuse-to-suse
redirect openSUSE docs to SUSE doc
2014-12-18 09:28:57 +10:00
Sven Dowideit de2a91970d redirect openSUSE docs to SUSE doc
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-12-18 09:05:27 +10:00
Srini Brahmaroutu c16e41245e Fix to avoid a compile error due to float to int truncation with GCCGO
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-12-17 22:44:55 +00:00
Jessie Frazelle 27b07bc39e Merge pull request #9711 from rhatdan/man
docker-run man page has screwed up indenting on --net option
2014-12-17 14:14:47 -08:00
Alexander Morozov c7f19c15d9 Merge pull request #9713 from unclejack/bump_vendored_kr_pty
kr/pty: vendor upstream 05017fcccf
2014-12-17 13:48:16 -08:00
unclejack 2524c0c555 kr/pty: vendor upstream 05017fcccf
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-12-17 23:23:24 +02:00
Dan Walsh bc1507dfce docker-run man page has screwed up indenting on --net option
This patch fixes the indenting.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-12-17 13:06:13 -05:00
Sven Dowideit f0f4e42375 Merge pull request #9703 from fredlf/1.4.1-docs-update
Additions for 1.4.1 release
2014-12-17 21:13:04 +10:00
Fred Lifton 6afe5bf9ed Additions for 1.4.1 release
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-12-16 17:40:02 -08:00
Jessie Frazelle 4988cde7b9 Merge pull request #9701 from crosbymichael/registry-lookup-image
Change LookupRemoteImage to return error
2014-12-16 17:00:59 -08:00
Jessie Frazelle d06f496e4a Merge pull request #9083 from SvenDowideit/pr_out_remove_small_patch_exception_checking_in_hack_make_validate_dco
Remove small patch exception checking in hack/make/validate-dco
2014-12-16 16:25:17 -08:00
Daehyeok Mun 8123c1e9fe Chnage LookupRemoteImage to return error
This commit is patch for following comment
// TODO: This method should return the errors instead of masking them and returning false

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-16 16:23:19 -08:00
Alexander Morozov f538e4be6b Merge pull request #9652 from yadutaf/master
Set HTTP upgrade headers when hijacking connection
2014-12-16 16:21:29 -08:00
Sven Dowideit 56e3f49d19 Give maintainers the power to add contributor's DCO to a commit message, or to use their own if its a trvial change
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-12-17 10:02:36 +10:00
Tianon Gravi 3d8f40b35b Remove small patch exception checking in hack/make/validate-dco
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-12-17 10:02:36 +10:00
Michael Crosby af72f2128e Remove DCO small patch exception
As we move forward on automating our pull request review process and
tooling these exceptions hurt more than they help.  For consistency we
should not allow small patch exceptions for anything.  The source of
truth going forward for DCO and builds are the official drone status on
each pull request.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-17 10:02:36 +10:00
Jean-Tiare Le Bigot afb06a3ce2 Update connection hijacking documentation with HTTP Upgrade Headers
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
2014-12-17 00:22:06 +01:00
Jessie Frazelle ad8096a1c2 Merge pull request #9287 from drothlis/fix-upstart-race-condition
upstart: Don't emit "started" event until docker.sock is available
2014-12-16 14:15:01 -08:00
Michael Crosby e927ab0ee7 Merge pull request #9695 from crosbymichael/merge_release_v1.4.1
Merge release v1.4.1
2014-12-16 13:44:01 -08:00
David Röthlisberger f42c0a53a3 upstart: Don't emit "started" event until docker.sock is available
Fixes #6647: Other upstart jobs that depend on docker by specifying
"start on started docker" would often start before the docker daemon was
ready, so they'd fail with "Cannot connect to the Docker daemon" or
"dial unix /var/run/docker.sock: no such file or directory".

This is because "docker -d" doesn't daemonize, it runs in the
foreground, so upstart can't know when the daemon is ready to receive
incoming connections. (Traditionally, a daemon will create all necessary
sockets and then fork to signal that it's ready; according to @tianon
this "isn't possible in Go"[1]. See also [2].)

Presumably this isn't a problem with systemd init with its socket
activation. The SysV init scripts may or may not suffer from this
problem but I have no motivation to fix them.

This commit adds a "post-start" stanza to the upstart configuration
that waits for the socket to be available. Upstart won't emit the
"started" event until the "post-start" script completes.[3]

Note that the system administrator might have specified a different path
for the socket, or a tcp socket instead, by customising
/etc/default/docker. In that case we don't try to figure out what the
new socket is, but at least we don't wait in vain for
/var/run/docker.sock to appear.

If the main script (`docker -d`) fails to start, the `initctl status
$UPSTART_JOB | grep -q "stop/"` line ensures that we don't loop forever.
I stole this idea from Steve Langasek.[4]

If for some reason we *still* end up in an infinite loop --I guess
`docker -d` must have hung-- then at least we'll be able to see the
"Waiting for /var/run/docker.sock" debug output in
/var/log/upstart/docker.log.

I considered using inotifywait instead of sleep, but it isn't worth
the complexity & the extra dependency.

[1] https://github.com/docker/docker/issues/6647#issuecomment-47001613
[2] https://code.google.com/p/go/issues/detail?id=227
[3] http://upstart.ubuntu.com/cookbook/#post-start
[4] https://lists.ubuntu.com/archives/upstart-devel/2013-April/002492.html

Signed-off-by: David Röthlisberger <david@rothlis.net>
2014-12-16 21:25:01 +00:00
Michael Crosby 171cf3d4d3 Change version to 1.4.1-dev 2014-12-16 12:26:01 -08:00
Michael Crosby 32c3823fd8 Merge pull request #9679 from crosbymichael/bump_v1.4.1
Bump to version v1.4.1
2014-12-16 12:24:15 -08:00
Alexander Morozov 323c3c1381 Merge pull request #9675 from JacobEdelman/patch-1
Fixed two misspellings
2014-12-16 12:06:23 -08:00
Michael Crosby 17cacf3326 Merge pull request #9643 from LK4D4/fix_vet_errors
Fix vet errors
2014-12-16 12:04:15 -08:00
Michael Crosby eea9f0e781 Merge pull request #9610 from duglin/Issue9602
Wrap strings that could look like ints in quotes
2014-12-16 12:02:26 -08:00
Tianon Gravi 03aea37f01 Merge pull request #9671 from albers/refactor-create-and-run
Refactor completion for docker run and docker create
2014-12-16 11:28:52 -08:00
Fred Lifton d79bc04e7b Merge pull request #9601 from dchen1107/master
Using container-vm image alias instead of specific name with version.
2014-12-16 11:01:15 -08:00
Michael Crosby c6a70bc78a Merge pull request #8845 from vbatts/vbatts-issue_template
CONTRIBUTING: provide a template for new issues
2014-12-16 10:41:43 -08:00
Arnaud Porterie a76f7c6ec3 Merge pull request #9122 from dqminh/debug-huge-expose
Expose a large number of ports should not slow down builder
2014-12-16 10:03:31 -08:00
James Turnbull 92d24e3b7c Merge pull request #9651 from kdomanski/filter_docs
Document container list filtering in API docs
2014-12-16 01:38:49 -05:00
Sven Dowideit fbb9223b1a add Scott's link checker script, and fix what it finds
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-12-16 14:46:25 +10:00
Scott Stamp 4e7fb6b1f0 Update debian.md
Fixed anchor links for Jessie/Wheezy (broken on docs.docker.com)

Update debian.md

Signed-off-by: Scott Stamp <scott@hypermine.com>
2014-12-16 12:49:53 +10:00
Michael Crosby 5bc2ff8a36 Bump to version 1.4.1
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-15 15:57:00 -08:00
Brian Goff a83dadbeaf Fix volumes-from/bind-mounts passed in on start
Fixes #9628
Slightly reverts #8683, HostConfig on start is _not_ deprecated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-12-15 15:54:06 -08:00
Michael Crosby eac27ad46d Add test to enforce volume build content
This tests ensures that the content from a dir within a build is carried
over even if VOLUME for that dir is specified in the Dockerfile.  This
test ensures this long standing functionality.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-15 15:53:55 -08:00
Michael Crosby 24d03b8dde Merge pull request #9631 from cpuguy83/9628_fix_volumes_hostconfig_on_start
Fix volumes-from/bind-mounts passed in on start
2014-12-15 15:51:57 -08:00
Jacob Edelman 97f07bb61c Fixed two misspellings.
Fixed two misspellings of the word "beginning".

Signed-off-by: JacobEdelman <edelman.jd@gmail.com>
2014-12-15 18:15:07 -05:00
Michael Crosby b84bfb43cd Merge pull request #9638 from crosbymichael/build-volumes-retain-contents
Add test to enforce volume build content
2014-12-15 14:54:38 -08:00
Brian Goff d44c9f9147 Fix volumes-from/bind-mounts passed in on start
Fixes #9628
Slightly reverts #8683, HostConfig on start is _not_ deprecated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-12-15 16:51:15 -05:00
Jessie Frazelle 03142fd5d2 Merge pull request #9674 from LK4D4/log_done
Fix missing logDone for TestRunMutableNetworkFiles
2014-12-15 13:48:04 -08:00
Alexander Morozov 03bdacbb4e Fix missing logDone for TestRunMutableNetworkFiles
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2014-12-15 13:44:22 -08:00
Harald Albers 46b104bd39 Refactor completion for docker run and docker create
_docker_run and _docker_create had only one differing line.

This refactoring features:

- direct completion for both commands to the same function
- factor out the common arguments, sort & format them nicely
- compute the argument for _docker_pos_first_nonflag.

Signed-off-by: Harald Albers <github@albersweb.de>
2014-12-15 21:08:49 +01:00
Jean-Tiare Le Bigot c230f70413 Set HTTP upgrade header only when requested by client
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
2014-12-15 21:05:59 +01:00
Jessie Frazelle e6a68a1c87 Merge pull request #9613 from pwaller/push-err-confusion-fix
Improve message when pushing a non-existent image
2014-12-15 09:54:34 -08:00
Alexander Morozov 1bdf579928 Merge pull request #9642 from jfrazelle/windows
Add windows back.
2014-12-15 08:36:36 -08:00
Tibor Vass 5e888abf7a Merge pull request #9666 from LK4D4/cleanup_tests
Remove TestRunExitOnStdinClose
2014-12-15 11:24:40 -05:00
Alexander Morozov c533d2cb9b Merge pull request #9668 from viirya/fix_error_type
Fix incorrect error type
2014-12-15 08:18:34 -08:00
Jessie Frazelle f58a79e591 Merge pull request #9630 from ztombol/9642-fix-mkimage-arch
Fix #9462
2014-12-15 08:13:11 -08:00