docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Lorenc
17536555b1 New import path. 
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
 2014-12-16 15:45:10 -08:00
Dan Lorenc
328977c83e Made cmds constants. 
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
 2014-12-16 15:41:10 -08:00
Nathan LeClaire
fb0407ecdc Only download boot2docker.iso one time 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-16 15:30:57 -08: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
Nathan LeClaire
6c889c3864 Fix a few things caught by go vet 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-16 14:21:44 -08: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
Victor Vieux
ad49f11c4e see https://github.com/codegangsta/cli/issues/160 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-12-16 21:05:15 +00:00
Victor Vieux
827cdf19f6 add --filter flag to specify which filter to use 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-12-16 21:05:15 +00:00
Brian Bland
a7b8e4fda0 Adds benchmarks for Put/Get, WriteStream/ReadStream, List, and Delete 
Also fixes an open fd leak in the filesystem driver that these
benchmarks revealed.
 2014-12-16 13:00:29 -08:00
Andrea Luzzardi
50c194cf1f Merge pull request #174 from vieux/bind_multiple_hosts 
--addr -> multiple -H + unix
 2014-12-16 12:54:20 -08:00
Victor Vieux
61acf9e2d2 remove dummy author 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-12-16 20:46:33 +00:00
Victor Vieux
6e8ef790af Merge pull request #181 from tianon/dco 
Add DCO and gofmt checking
 2014-12-16 12:27:56 -08: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
Evan Hazlett
3d1582c69f add default zone for amazonec2 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-16 14:37:23 -05: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
Tianon Gravi
27198c1fca Add "sudo: false" so we get the faster Docker-based workers 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-12-16 12:24:10 -07:00
Tianon Gravi
9a6ef553f5 Add DCO and gofmt checking 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-12-16 12:23:50 -07:00
Dan Lorenc
5525cf9f6f Proppy code review feedback. 
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
 2014-12-16 11:16:25 -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
Ben Firshman
808bde5b14 Merge pull request #107 from nathanleclaire/dockerignore 
A few additions to .dockerignore
 2014-12-16 18:52:27 +00: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
Mary Anthony
078ac9ca45 Updating per PR comment 
Signed-off-by: Mary Anthony <moxieandmore@gmail.com>
 2014-12-16 10:16:20 -08:00
Mary Anthony
46748f1302 Updating per PR comments 
Signed-off-by: Mary Anthony <moxieandmore@gmail.com>
 2014-12-16 10:14:03 -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
Jeff Morgan
4722ce6445 Merge branch 'master' into jmorgan_bump_0.4.3 2014-12-16 07:21:37 -08:00
Jeff Morgan
e8696d7fd5 Merge branch 'master' into jmorgan_bump_0.4.3 2014-12-16 07:21:37 -08:00
Daniel, Dao Quang Minh
17f8e3dee2 make.sh tgz should handle windows binary 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
 2014-12-16 05:05:18 -05: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
Jeffrey Morgan
1655ddc70c Merge pull request #142 from kitematic/jmorgan_fix_image_tags 
Fixing image tag ordering and rendering
 2014-12-15 22:03:29 -08:00
Jeffrey Morgan
386b8bbc2c Merge pull request #142 from kitematic/jmorgan_fix_image_tags 
Fixing image tag ordering and rendering
 2014-12-15 22:03:29 -08:00
Jeff Morgan
9472dd4dcc Fixing image tag ordering and rendering 2014-12-15 22:01:29 -08:00
Jeff Morgan
44ed5d9479 Fixing image tag ordering and rendering 2014-12-15 22:01:29 -08:00
Sven Dowideit
c9ca5c4dd3 Update the documentation for #9356 fix 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2014-12-16 15:25:15 +10: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
dlorenc
17d8b16a37 GCE Driver. 
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
 2014-12-15 20:23:38 -08:00
Evan Hazlett
888181245e use vpc-id and zone instead of subnet-id for ec2 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-15 22:38:57 -05: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
Stephen Day
15ecd3b3e9 Merge pull request #855 from BrianBland/ng-configuration 
Allows HTTP bind address to be overridden by an environment variable
 2014-12-15 18:27:20 -08:00
Brian Bland
1a6893dbb6 Adds pre-commit hook, hook config script, and a README 
The pre-commit hook will automatically gofmt code in place, warning you
about any changes. It will also fail to commit if either golint or go
vet fails.
 2014-12-15 18:09:11 -08:00
Nathan LeClaire
77fe4a4e6e Add .git to .dockerignore 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-15 18:01:21 -08:00
Victor Vieux
b0293f8767 see https://github.com/codegangsta/cli/issues/160 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-12-16 01:54:15 +00:00
Ben Firshman
f43a0f2a9a Merge pull request #106 from nathanleclaire/modify_osarch 
Allow optional override of OS and arch in build (speed up compilation)
 2014-12-16 01:50:22 +00:00
Olivier Gambier
049bf61912 Fix test 2014-12-15 17:41:30 -08:00
Victor Vieux
bb4db048ec 660 -> 600 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-12-16 01:12:56 +00:00