Johan Euphrosine
5a17c208cd
docs/installation/google: add enabling Google Compute Engine step
2013-12-05 09:43:08 -08:00
Andy Rothfusz
94d46a8d3a
Merge pull request #2991 from fortybillion/patch-1
...
API documentation: added format of Volumes and Binds parameters to "create" and "start"
2013-12-04 18:32:19 -08:00
Andy Rothfusz
ec9f2f1d0f
Merge branch '2971-cleanconflicts'
2013-12-04 18:26:45 -08:00
Andy Rothfusz
0bfa22124e
Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts
...
Conflicts:
docs/sources/examples/postgresql_service.rst
2013-12-04 18:25:58 -08:00
Victor Vieux
79031c4f8c
Merge pull request #2907 from goldmann/iptables-fix
...
Make sure the firewall rules are created even if the bridge interface is already created
2013-12-04 18:04:57 -08:00
Victor Vieux
5f55c1aee1
Merge pull request #2966 from andrewsmedina/govet2
...
fixed some `go vet` issues.
2013-12-04 17:57:10 -08:00
Solomon Hykes
c35cebaa06
Merge pull request #3031 from jamtur01/docsmaintain
...
Add James Turnbull to docs maintainers
2013-12-04 17:48:45 -08:00
Victor Vieux
41b5e87873
Merge pull request #2993 from jpoimboe/rhel6-version-check
...
remove kernel version warning on rhel 6.5
2013-12-04 17:46:20 -08:00
Andy Rothfusz
9dfc7bc36f
Merge pull request #2834 from fj/topic/clarify-aws-instructions
...
Fix installing-on-AWS workflow description
2013-12-04 17:25:35 -08:00
Guillaume J. Charmes
afbea3f13f
Merge pull request #3058 from dotcloud/add_stderr_hijack
...
fix docker run -a stderr
2013-12-04 17:16:56 -08:00
Andy Rothfusz
5dab47a475
Merge pull request #2886 from jamtur01/fedora_community
...
Updated Fedora docs
2013-12-04 17:12:00 -08:00
Victor Vieux
3ba279a370
fix docker run -a stderr
2013-12-04 17:08:14 -08:00
Guillaume J. Charmes
944c1f10ea
Merge pull request #2967 from crosbymichael/return-host-config
...
Add hostconfig to container inspect
2013-12-04 16:50:42 -08:00
Michael Crosby
3a8222dfa5
Merge pull request #3032 from tianon/makefile-tweaks
...
Tweak Makefile for consistency and Ctrl+C-ability
2013-12-04 16:04:47 -08:00
Tianon Gravi
00030ced4b
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
2013-12-04 16:56:01 -07:00
Andy Rothfusz
f95621fd05
Merge pull request #3033 from proppy/add-compute-docs
...
Add Google Cloud Platform installation docs
2013-12-04 15:05:07 -08:00
Guillaume J. Charmes
4328926acc
Merge pull request #3020 from crosbymichael/remove-init-layer
...
Ensure that the init layer is removed with the container
2013-12-04 14:46:48 -08:00
Johan Euphrosine
3df5d120de
docs/installation: add google compute engine quickstart
2013-12-04 12:25:22 -08:00
Victor Vieux
1b5517b68f
Merge pull request #3046 from dotcloud/fix_offline_image_transfert_jsonmessage
...
Fix offline image transfer jsonmessage
2013-12-04 12:05:28 -08:00
Victor Vieux
4bc100b494
fix jsonmessage
2013-12-04 11:57:18 -08:00
Victor Vieux
be282b57d5
fix offline image transfert
2013-12-04 11:55:42 -08:00
Victor Vieux
12180948be
remove unused parameter in Download
2013-12-04 11:54:11 -08:00
Victor Vieux
6cf2c14c00
Merge pull request #2796 from EmilHernvall/master
...
Support for same port on multiple interfaces
2013-12-04 11:15:51 -08:00
Michael Crosby
dc9f8bf072
Merge pull request #2790 from proppy/fix-tar
...
utils: remove dotcloud/tar dep
2013-12-04 11:06:13 -08:00
Michael Crosby
0862756beb
Merge pull request #3018 from pnasrat/3017-debug-expvar
...
Expose expvar endpoint during debugging.
2013-12-04 10:53:35 -08:00
Andy Rothfusz
de60bee3d4
Merge pull request #2946 from dhrp/doc-postgres-typo
...
Fixed some grammar and one other line in postgres example
2013-12-04 10:51:02 -08:00
Michael Crosby
51b9fe7301
Merge pull request #3000 from creack/improve_make_sh_test
...
Improve make sh test
2013-12-04 10:41:55 -08:00
Michael Crosby
61aad8fc10
Merge pull request #3029 from pnasrat/container-refactoring
...
Container refactoring
2013-12-04 10:35:42 -08:00
Paul Nasrat
40fe9f581b
Extract volume bind, creation and external methods.
...
Make Start() slightly more readable.
2013-12-03 18:58:31 -05:00
Sam Alba
258d707548
Merge pull request #2339 from shin-/private_reg_auth
...
Private registry auth
2013-12-03 15:29:38 -08:00
Victor Vieux
99e4f56353
Merge pull request #2930 from creack/docker-osx
...
Docker client on OSX
2013-12-03 15:27:21 -08:00
James Turnbull
0132547a38
Added myself to docs MAINTAINERS
2013-12-03 17:51:34 -05:00
Paul Nasrat
84f78d9cad
Extract helper method for volume linking.
...
Makes this more readable.
2013-12-03 17:35:54 -05:00
Victor Vieux
f8176de191
Merge pull request #2999 from dotcloud/improve_progress_bars
...
Handle small screens
2013-12-03 14:24:40 -08:00
Victor Vieux
f50fe14e13
Handle small screens
2013-12-03 14:21:33 -08:00
James Turnbull
45567f2209
Updated Fedora docs
...
* Added Fedora installation instructions
2013-12-03 16:55:55 -05:00
Victor Vieux
2fd76fc0b8
Merge pull request #3009 from silas/stream-logs
...
Add stream flag to logs command
2013-12-03 13:43:35 -08:00
Silas Sewell
b699aee91f
Rename logs -stream to logs -f
2013-12-03 20:35:22 +00:00
Michael Crosby
664174c7aa
Add docs for hostconfig in inspect
2013-12-03 11:09:10 -08:00
Michael Crosby
7428e6a5f0
Merge pull request #3022 from pnasrat/3021-makefile-testflags
...
Support TESTFLAGS
2013-12-03 10:55:22 -08:00
Paul Nasrat
d21563ced3
Support TESTFLAGS
2013-12-03 14:49:10 -05:00
Paul Nasrat
6a55169e2e
Expose expvar endpoint during debugging.
...
Fixes #3017
2013-12-03 13:04:18 -05:00
Michael Crosby
5976c26c1e
Ensure that the init layer is removed with the container
2013-12-03 09:44:48 -08:00
shin-
9be5db8704
Handle 401 response in auth.Login() for authed private registries
2013-12-03 16:32:13 +01:00
shin-
3f92163989
Don't return req as result of setTokenAuth
2013-12-03 16:32:13 +01:00
shin-
3b5010e90b
missed one call to setTokenAuth
2013-12-03 16:32:13 +01:00
shin-
ec4863ae55
Factorized auth token setting
2013-12-03 16:32:13 +01:00
shin-
a02bc8a5db
gofmt
2013-12-03 16:32:13 +01:00
shin-
045989e3d8
Use basic auth for private registries when over HTTPS.
...
RequestFactory is no longer a singleton (can be different for different instances of Registry)
Registry now has an indexEndpoint member
Registry methods that needed the indexEndpoint parameter no longer do so
Registry methods will only use token auth where applicable if basic auth is not enabled.
2013-12-03 16:32:13 +01:00
shin-
bbf9135adc
Added HTTPAuthDecorator
2013-12-03 16:24:47 +01:00
