Phil Estes
b5184d3c24
Fix gh#7747 - filter bare newline output and log client pull to stdout
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2014-09-06 01:06:18 -04:00
Sean Li
e1f1f41efb
Added GA to track usage analytics and option to disable it.
2014-09-05 19:52:03 -07:00
Sean Li
2db3561492
Added GA to track usage analytics and option to disable it.
2014-09-05 19:52:03 -07:00
Marc Tamsky
d229821501
use tune2fs to disable ext4 mount counts and mount intervals
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com > (github: tamsky)
2014-09-05 19:32:39 -07:00
Ben Firshman
ee6bb9a252
Merge pull request #475 from bfirsh/fix-missing-six-package
...
Fix missing six package
2014-09-06 02:20:55 +01:00
Ben Firshman
866050937a
Fix missing six package
...
I had some .pyc files kicking around, urgh.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-09-05 17:19:53 -07:00
Ben Firshman
41ee65b664
Merge branch 'dnephin-replace_packages_with_deps'
...
Closes #375
2014-09-05 11:55:17 -07:00
Daniel Nephin
7fd37c89b9
Remove fig.packages replace with real deps.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2014-09-05 11:44:49 -07:00
Aanand Prasad
8d3c9dccc5
Merge pull request #402 from dnephin/fig_ports.rebase
...
Fig port command
2014-09-05 11:09:40 -07:00
Nathan Hsieh
e44bdd612b
added a css fix for the image bug issue
...
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
(github: nhsiehgit)
2014-09-05 10:48:51 -07:00
Tianon Gravi
38186084b3
Merge pull request #7893 from tianon/travis-run-tests
...
Update Travis to also run the test suite
2014-09-05 09:19:38 -06:00
James Turnbull
712702aa79
Merge pull request #7894 from SvenDowideit/use-local-jquery
...
Use a local copy of jquery so that the docs work in China, and offline too.
2014-09-05 08:51:09 -04:00
Arthur Gautier
3e6c69e5a1
Fix SEGFAULT if dns resolv error
...
Per registry.doRequest, res and client might be nil in case of error
For example, dns resolution errors, /etc/docker/certs.d perms, failed
loading of x509 cert ...
This will make res.StatusCode and res.Body SEGFAULT.
Signed-off-by: Arthur Gautier <baloo@gandi.net >
2014-09-05 13:40:06 +02:00
Daniel Nephin
f5d43b6452
Resolves #455 - volumes_from a service with no containers.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2014-09-04 22:21:49 -04:00
Daniel Nephin
c48ee5caef
Add a new fig command for retrieving the locally bound port of a service.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2014-09-04 22:09:12 -04:00
Sven Dowideit
5fe94f0d91
Use a local copy of jquery so that the docs work in China, and offline too.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-05 11:48:34 +10:00
Fred Lifton
58e8987837
Adding first draft of Official Repo Guidelines
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-04 18:09:00 -07:00
Victor Vieux
b0cff06c97
Merge pull request #7883 from LK4D4/fix_build_race
...
Fix race between dispatchers.run and toDisk
2014-09-04 17:32:46 -07:00
Sven Dowideit
03fdc7d2c1
Merge pull request #7890 from fredlf/docs-cherry-pick-update-process
...
Changes to Sven's cherry pick process
2014-09-05 09:58:18 +10:00
Tianon Gravi
068b9ac4d2
Update Travis to also run the test suite
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-09-04 17:20:02 -06:00
Tibor Vass
1a2a4f61ab
Merge pull request #7878 from LK4D4/fix_net_for_none
...
Don't initialize network for 'none' mode
2014-09-04 15:30:03 -07:00
Tianon Gravi
d3b5bf5d24
Merge pull request #7763 from jamtur01/kate
...
Add syntax highlighting file for KDE's "Kate" editor
2014-09-04 15:28:11 -06:00
Fred Lifton
b23daef3ec
Changes to Sven's cherry pick process
...
Added content and revised after walk-through
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-04 13:32:16 -07:00
Sean Li
38181a9579
Merge branch 'rc'
2014-09-04 12:51:24 -07:00
Sean Li
2911986748
Merge branch 'rc'
2014-09-04 12:51:24 -07:00
Sean Li
8645cc60ce
Can now select logs.
2014-09-04 12:51:01 -07:00
Sean Li
9e1162eae2
Can now select logs.
2014-09-04 12:51:01 -07:00
James Turnbull
f7c0ac9a8b
Merge pull request #7873 from jankeromnes/patch-1
...
Update SSH demo to ubuntu 14.04
2014-09-04 15:45:55 -04:00
Ben Firshman
2827786886
Merge pull request #364 from docker/non-numeric-link-alias
...
Non-numeric link alias
2014-09-04 20:39:18 +01:00
Aanand Prasad
7ad91f3f00
Merge pull request #442 from dnephin/fix_create_container_volumes
...
Additional validation for container volumes and ports.
2014-09-04 12:12:09 -07:00
Jan Keromnes
98f57d1c39
Update SSH demo to ubuntu 14.04
...
Signed-off-by: Jan Keromnes <janx@linux.com >
2014-09-04 20:27:41 +02:00
James Turnbull
bc26aa7b50
Merge pull request #7876 from nhsiehgit/typofix
...
small typo. wrapping cut code snippet
2014-09-04 12:37:07 -04:00
Alexandr Morozov
f17410da5e
Fix race between dispatchers.run and toDisk
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-04 19:43:28 +04:00
Jeff Morgan
000d916693
Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix
...
Conflicts:
meteor/client/lib/docker.js
meteor/client/lib/validations.js
meteor/client/lib/virtualbox.js
meteor/lib/validations.js
meteor/server/apps.js
meteor/server/lib/validations.js
2014-09-04 02:39:13 -07:00
Jeff Morgan
effef0c2e6
Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix
...
Conflicts:
meteor/client/lib/docker.js
meteor/client/lib/validations.js
meteor/client/lib/virtualbox.js
meteor/lib/validations.js
meteor/server/apps.js
meteor/server/lib/validations.js
2014-09-04 02:39:13 -07:00
Jeffrey Morgan
c1bdb79908
Update README.md
2014-09-04 00:27:50 -07:00
Jeffrey Morgan
c3009506dc
Update README.md
2014-09-04 00:27:50 -07:00
Alexandr Morozov
ba24820284
Don't initialize network for 'none' mode
...
Fixes #7837
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-04 09:50:58 +04:00
Jeff Morgan
41468cfed7
Bumping virtualbox
2014-09-03 21:02:31 -07:00
Jeff Morgan
f263f76b4b
Bumping virtualbox
2014-09-03 21:02:31 -07:00
Sean Li
b88660c13d
Only updates status after dig is ran.
2014-09-03 20:57:26 -07:00
Sean Li
04888e3e5a
Only updates status after dig is ran.
2014-09-03 20:57:26 -07:00
Sean Li
718c9cd6e4
Turned off log timestamp.
2014-09-03 20:39:26 -07:00
Sean Li
80bf56c35e
Turned off log timestamp.
2014-09-03 20:39:26 -07:00
Sven Dowideit
dbe1123607
Merge pull request #7828 from vieux/update_api_docs
...
Remote api docs for POST /containers/create were out of sync with runconfig/config.go
2014-09-04 13:05:06 +10:00
Sven Dowideit
e1907bafb7
Merge pull request #7858 from somaopensource/typo-fix
...
Dockerfile documentation typo and content fix
2014-09-04 13:03:04 +10:00
Sean Li
e7426dc6cb
Fixed up dig command.
2014-09-03 19:45:34 -07:00
Sean Li
5f2cb41440
Fixed up dig command.
2014-09-03 19:45:34 -07:00
Sean Li
fd45571c2e
Renamed image rebuild functions.
2014-09-03 19:30:38 -07:00
Sean Li
9ff6af34d5
Renamed image rebuild functions.
2014-09-03 19:30:38 -07:00