Tianon Gravi
2035af44aa
Always copy dockerinit locally, regardless of whether our docker binary is static, because even it might get deleted or moved/renamed
2013-12-16 22:29:00 -07:00
Guillaume J. Charmes
69a31c3386
Improve TestParseHost
2013-12-16 16:35:56 -08:00
Guillaume J. Charmes
20605eb310
Allow to use -H unix:// like -H tcp://
2013-12-16 16:30:23 -08:00
Johannes 'fish' Ziemke
4faba4fae7
Reimplement lxc-ps
...
Instead of calling lxc-ps in top endpoint, we reimplement it by
calling ps and filter for pids running in a given container.
2013-12-16 13:30:35 +01:00
Guillaume J. Charmes
8fd9633a6b
Improve FollowLink to handle recursive link and be more strick
2013-12-11 17:19:02 -08:00
Michael Crosby
f396c42cad
Fix volumes on the host by following symlinks in a scope
2013-12-11 16:31:02 -08:00
Victor Vieux
2c646b2d46
disable progressbar in non-terminal
2013-12-06 14:09:27 -08:00
Victor Vieux
05f416d869
fix jsonmessage in build
2013-12-06 14:09:27 -08:00
Victor Vieux
4bc100b494
fix jsonmessage
2013-12-04 11:57:18 -08:00
Victor Vieux
12180948be
remove unused parameter in Download
2013-12-04 11:54:11 -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
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
f50fe14e13
Handle small screens
2013-12-03 14:21:33 -08:00
shin-
bbf9135adc
Added HTTPAuthDecorator
2013-12-03 16:24:47 +01:00
Guillaume J. Charmes
5cd09dc115
small reformatting jsonmessage
2013-12-02 11:49:11 -08:00
Guillaume J. Charmes
6ea3b9651b
Fix displayJson behavior (dont add newline)
2013-12-02 11:47:13 -08:00
Michael Crosby
8cc524996a
Merge pull request #2924 from tianon/strict-fhs-compatibility
...
Add proper dockerinit path support for distros that use FHS 2.3
2013-12-02 11:35:36 -08:00
Michael Crosby
fe571dd293
Merge pull request #2829 from dotcloud/refactor_opts
...
Refactor opts
2013-12-02 10:41:30 -08:00
Michael Crosby
e1414a4c39
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
2013-12-02 10:31:09 -08:00
Johannes 'fish' Ziemke
b04c6466cd
Make docker build return exit code of build step
...
If a command during build fails, `docker build` now returns with
the exit code of that command.
This makes it necessary to change the build api endpoint to
return a json object stream.
2013-12-02 17:52:37 +01:00
Guillaume J. Charmes
77c94175bd
Make CopyEscapable consistent with Copy and return nil in case of success instead of io.EOF
2013-11-28 16:57:51 -08:00
Victor Vieux
d3cc558d14
add test
2013-11-28 16:28:31 -08:00
Victor Vieux
b36dd3f9cc
fix display on test
2013-11-28 14:40:17 -08:00
Victor Vieux
ebc36b879d
add progressbar and time
2013-11-28 14:33:18 -08:00
Victor Vieux
597e0e69b4
split in 3 files
2013-11-28 12:16:57 -08:00
Tianon Gravi
438607ecc3
Add proper dockerinit path support for distros that use FHS 2.3
2013-11-28 11:11:30 -07:00
Guillaume J. Charmes
1ba11384bf
Refactor Opts
2013-11-26 17:46:06 +00:00
Victor Vieux
110c4f2043
create a copy of dockerinit
2013-11-25 20:21:54 -08:00
Guillaume J. Charmes
19df6c32c0
Merge branch 'master' into use_utc_time
...
Conflicts:
image.go
2013-11-25 19:01:13 -08:00
Michael Crosby
e69bbd239e
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-22 14:06:59 -08:00
Guillaume J. Charmes
476559458d
Reformatting parseRun and partParse
2013-11-22 11:58:02 -08:00
Mark Allen
8b0cd60019
Pass terminal setting to display utils
2013-11-22 00:05:55 -06:00
Michael Crosby
0cecc2a78c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
806abe90ba
Use UTC for time
2013-11-21 16:43:36 -08:00
Johan Euphrosine
b3bee7e0c4
utils: remove dotcloud/tar dep
2013-11-20 18:45:12 +00:00
Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
2013-11-19 14:58:12 -08:00
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
Michael Crosby
51576069ad
Merge pull request #2694 from shykes/separate-integration-tests
...
Separate integration tests
2013-11-15 18:21:34 -08:00
Guillaume J. Charmes
7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Conflicts:
utils.go
utils_test.go
2013-11-14 14:02:44 -08:00
Michael Crosby
629c6e3649
Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm
...
Fix lxc start for shared root filesystems
2013-11-14 11:20:53 -08:00
Solomon Hykes
2a209afe5f
gofmt
2013-11-14 10:50:43 -08:00
Solomon Hykes
359a6f49b9
Move integration tests to integration/, expose missing public methods in the core
2013-11-14 10:50:00 -08:00
Solomon Hykes
b00d5f0185
gofmt
2013-11-13 19:25:55 +00:00
Michael Crosby
a4f14528c2
Ignore dir sizes in TreeSize func
2013-11-13 10:33:24 -08:00
Solomon Hykes
6c4393ccbb
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
2013-11-13 00:36:20 +00:00
Liang-Chi Hsieh
879aa29cb0
modify test of GetNameserversAsCIDR for its regex change.
2013-11-12 18:18:30 +08:00
Liang-Chi Hsieh
1e5ba57de3
fix nameserver regex.
2013-11-12 10:53:34 +08:00
Victor Vieux
da24945070
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
2013-11-11 12:34:16 -08:00
Solomon Hykes
165d1bdbc0
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
runtime.go
2013-11-07 23:26:52 +00:00
Solomon Hykes
f2bab1557c
Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
2013-11-07 22:38:50 +00:00
