e5b8f32fec
disable progressbar in non-terminal
...
Upstream-commit: 2c646b2d466b1401fccbfd453a68f0023dd5e300
Component: engine
2013-12-06 14:09:27 -08:00
d92518e8b2
fix jsonmessage in build
...
Upstream-commit: 05f416d869777aa613a5a197ad287c18b77366d3
Component: engine
2013-12-06 14:09:27 -08:00
dbb1b9b6d5
fix jsonmessage
...
Upstream-commit: 4bc100b494022901d4d7f51cba303ae3562b1303
Component: engine
2013-12-04 11:57:18 -08:00
8eac8d89db
remove unused parameter in Download
...
Upstream-commit: 12180948be8040a4cdf99a0e660098cd33e32832
Component: engine
2013-12-04 11:54:11 -08:00
f2f4f227e1
Merge pull request #2790 from proppy/fix-tar
...
utils: remove dotcloud/tar dep
Upstream-commit: dc9f8bf072dfb65f32c6dc569d133361030daa0a
Component: engine
2013-12-04 11:06:13 -08:00
0171e1cc75
Merge pull request #2339 from shin-/private_reg_auth
...
Private registry auth
Upstream-commit: 258d707548619eae7517b39ff0bc9541ebec566c
Component: engine
2013-12-03 15:29:38 -08:00
71ac3b3d2a
Handle small screens
...
Upstream-commit: f50fe14e13160c7c823613710a6fa12c9fc13bcb
Component: engine
2013-12-03 14:21:33 -08:00
13eb2fe87b
Added HTTPAuthDecorator
...
Upstream-commit: bbf9135adcaec9edc2e9d0ebce6a78ba3ade3689
Component: engine
2013-12-03 16:24:47 +01:00
16982ec76d
small reformatting jsonmessage
...
Upstream-commit: 5cd09dc1158c62754641dce9c59a735c41e59722
Component: engine
2013-12-02 11:49:11 -08:00
134dbf8c6a
Fix displayJson behavior (dont add newline)
...
Upstream-commit: 6ea3b9651b3793e31a320926472ff23383a7b915
Component: engine
2013-12-02 11:47:13 -08:00
4ad49ae63e
Merge pull request #2924 from tianon/strict-fhs-compatibility
...
Add proper dockerinit path support for distros that use FHS 2.3
Upstream-commit: 8cc524996a0d29a5b11a14ef17950193d45c1e05
Component: engine
2013-12-02 11:35:36 -08:00
26b3fb6752
Merge pull request #2829 from dotcloud/refactor_opts
...
Refactor opts
Upstream-commit: fe571dd29328efe5f5318c0b146d0aa5a66217a2
Component: engine
2013-12-02 10:41:30 -08:00
92e4ac1dc3
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
Upstream-commit: e1414a4c3999362c97ad66ed1dd9cd64678df9af
Component: engine
2013-12-02 10:31:09 -08:00
85e4b81e0c
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.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
2013-12-02 17:52:37 +01:00
04d46060bc
Make CopyEscapable consistent with Copy and return nil in case of success instead of io.EOF
...
Upstream-commit: 77c94175bdc387e7f43876f7097b970f67116054
Component: engine
2013-11-28 16:57:51 -08:00
ca4170e277
add test
...
Upstream-commit: d3cc558d140283a4ce051827705814cf4ca96f7a
Component: engine
2013-11-28 16:28:31 -08:00
e7389b7de1
fix display on test
...
Upstream-commit: b36dd3f9ccc61e42024cf1f2799c73f0efc77c75
Component: engine
2013-11-28 14:40:17 -08:00
53c5a8d270
add progressbar and time
...
Upstream-commit: ebc36b879d4197a9455b325b529da212539e180c
Component: engine
2013-11-28 14:33:18 -08:00
ee50ddf929
split in 3 files
...
Upstream-commit: 597e0e69b4c8521f39691d0a07d1f31b7116a337
Component: engine
2013-11-28 12:16:57 -08:00
dc3ebf1a2f
Add proper dockerinit path support for distros that use FHS 2.3
...
Upstream-commit: 438607ecc321a0256b7597cf278d4356632aac2f
Component: engine
2013-11-28 11:11:30 -07:00
f211a9a21d
Refactor Opts
...
Upstream-commit: 1ba11384bf82f824b0efbab31aaca439cfba1b4f
Component: engine
2013-11-26 17:46:06 +00:00
db32c4ebfa
create a copy of dockerinit
...
Upstream-commit: 110c4f20434af89d81580670f2cec25b1e82633a
Component: engine
2013-11-25 20:21:54 -08:00
020e2aed63
Merge branch 'master' into use_utc_time
...
Conflicts:
image.go
Upstream-commit: 19df6c32c03a649795415bcdf2fd062715557be1
Component: engine
2013-11-25 19:01:13 -08:00
627f045fff
Merge branch 'master' into 0.6.5-dm-plugin
...
Upstream-commit: e69bbd239ee8dc4bdc0963810448d9f34e4c30c4
Component: engine
2013-11-22 14:06:59 -08:00
c04337f42e
Reformatting parseRun and partParse
...
Upstream-commit: 476559458d49b6d4eacfdbe9025ddf69947ae2b7
Component: engine
2013-11-22 11:58:02 -08:00
65390c08ce
Pass terminal setting to display utils
...
Upstream-commit: 8b0cd60019b33488f8819da5c7bdd28d1d3fc737
Component: engine
2013-11-22 00:05:55 -06:00
cf914fd88c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6
Component: engine
2013-11-21 17:18:41 -08:00
eec0335af0
Use UTC for time
...
Upstream-commit: 806abe90ba38741707f58e98ecdcdd4bc19f52e2
Component: engine
2013-11-21 16:43:36 -08:00
c226d5fb61
utils: remove dotcloud/tar dep
...
Upstream-commit: b3bee7e0c43dd281c081cd59d7403148d3f8af88
Component: engine
2013-11-20 18:45:12 +00:00
b6950e3878
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
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine
2013-11-19 14:58:12 -08:00
6e0c243c2e
Lintify code with confidence=1
...
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
2013-11-18 16:24:11 -08:00
b91918adb1
Merge pull request #2694 from shykes/separate-integration-tests
...
Separate integration tests
Upstream-commit: 51576069ad7470d308402536306c35f47cf89edb
Component: engine
2013-11-15 18:21:34 -08:00
7686e1f389
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Conflicts:
utils.go
utils_test.go
Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385
Component: engine
2013-11-14 14:02:44 -08:00
bf15883f56
Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm
...
Fix lxc start for shared root filesystems
Upstream-commit: 629c6e36492336f01fd4e25426a5c875f52628e2
Component: engine
2013-11-14 11:20:53 -08:00
13d08cbd03
gofmt
...
Upstream-commit: 2a209afe5fe0f27296e3e06a199bb5305910e1cf
Component: engine
2013-11-14 10:50:43 -08:00
6c1679864e
Move integration tests to integration/, expose missing public methods in the core
...
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
2013-11-14 10:50:00 -08:00
cea9cd6554
gofmt
...
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
2013-11-13 19:25:55 +00:00
2e972c6b88
Ignore dir sizes in TreeSize func
...
Upstream-commit: a4f14528c25c4a092c30334d05008fe44275a79e
Component: engine
2013-11-13 10:33:24 -08:00
a48718c85a
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
Upstream-commit: 6c4393ccbbec0fa66f9fc7e326b5a2809615c3a1
Component: engine
2013-11-13 00:36:20 +00:00
5ec9c64577
modify test of GetNameserversAsCIDR for its regex change.
...
Upstream-commit: 879aa29cb09c641bbd510eed03647f8f85f0d559
Component: engine
2013-11-12 18:18:30 +08:00
31cff767cd
fix nameserver regex.
...
Upstream-commit: 1e5ba57de372bd13b0231e969dbb62a7fa8d7b52
Component: engine
2013-11-12 10:53:34 +08:00
fac387b017
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
...
Upstream-commit: da24945070e305e09d4d96d1f981614eaa18b01f
Component: engine
2013-11-11 12:34:16 -08:00
c471d2b756
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine
2013-11-07 23:26:52 +00:00
7e3e167f73
Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
...
Upstream-commit: f2bab1557c3fef4a95b5b982fe7127fcb29c4f8f
Component: engine
2013-11-07 22:38:50 +00:00
6d24142423
go fmt
...
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
2013-11-07 12:27:33 -08:00
58f4b4c19f
Utils: Add ShellQuoteArguments
...
Upstream-commit: c5bc7d515836cffee90ba5bb342272bba64d9f37
Component: engine
2013-11-06 20:39:09 +01:00
a507d209c4
Prevent DNS server conflicts in CreateBridgeIface
...
Retrieve /etc/resolv.conf data (if available)
Add checkNameserverOverlaps and call it to
make sure there are no conflicts
Add utils.GetNameserversAsCIDR and tests
Read /etc/resolv.conf and pull out nameservers,
formatting them as a CIDR block ("1.2.3.4/32")
Upstream-commit: 3560c922b193e0f6b06c715a7b920f90a5990859
Component: engine
2013-11-05 21:24:37 -06:00
c136168290
Hack: simplify the creation of test directories
...
Upstream-commit: 5a85456d481a5f88fc0efc02c41b3bff987c0ed1
Component: engine
2013-11-05 23:00:16 +00:00
062afa9bce
Merge pull request #2427 from thequux/send-headers-immediately
...
Make /events API send headers immediately
Upstream-commit: 2a0efb23243f2e72e61efa51ceaafa58353cf21b
Component: engine
2013-11-04 08:49:27 -08:00
ee347d7b68
Added explicit Flush method to utils.WriteFlusher
...
Upstream-commit: a963ff5d8df4e6d0e42dd669d3d60aafb8f880a7
Component: engine
2013-11-01 13:11:21 -04:00
