Commit Graph

437 Commits

Author SHA1 Message Date
8b7816d5d5 Bump version to 0.4.8
Upstream-commit: 96a1d7c6455b5b4326469f9a51bee869883aac3c
Component: engine
2013-07-01 16:58:25 -07:00
f8f9a4db66 Merge pull request #1046 from dotcloud/1043-output_id_non_attach-fix
- Runtime: Make sure the ID is displayed usgin run -d
Upstream-commit: 79ee8b46f449aaa0770e16be6af5e1ea8b77a1cc
Component: engine
2013-07-01 16:49:43 -07:00
4240b58553 Bump version to 0.4.7
Upstream-commit: ca497a82abfe92f2dbe1a7e161dc7ff19eefeec4
Component: engine
2013-06-29 21:12:29 -07:00
0081ddc545 Allow push by ID when using a custom registry
Upstream-commit: e095a1572fb8a2ba17ea231abcb3704cf83a96e4
Component: engine
2013-06-28 18:19:58 +02:00
ad4f82e6d2 Merge pull request #1032 from andrewsmedina/govet
following the 'go vet' suggestions for the docker package.
Upstream-commit: a11fc9f067d898e3dd6a43e9841e2ea85842af2b
Component: engine
2013-06-28 05:27:53 -07:00
13ee8793a9 Make sure the ID is displayed usgin run -d
Upstream-commit: bd144a64f652895a41b67464a426839ef79d73dc
Component: engine
2013-06-27 12:48:25 -07:00
77a309a0df fix panic with unix socket
Upstream-commit: 9d3ec7b39fcf178eaa9aa1482f0a85c257df4408
Component: engine
2013-06-27 12:57:19 +00:00
e593de79dc following the 'go vet' suggestions.
Upstream-commit: 3d5633a0a0eb98bbd833e760279720a15ced8b58
Component: engine
2013-06-27 01:33:55 -03:00
a223caa9e6 + Runtime: mount volumes from a host directory with 'docker run -b'
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
c81eba049a Add missing fprintf instead of printf
Upstream-commit: 6127d757a7495df83b3d4cec53dc56b48c764023
Component: engine
2013-06-25 10:39:11 -07:00
51f8e07a39 Implement regression test for stdin attach
Upstream-commit: 5190f7f33a9e36f1f5991a385f4db198e9f1b3a6
Component: engine
2013-06-24 18:36:04 -07:00
38132ab186 Make NewDockerCli handle terminal
Upstream-commit: 873a5aa8e72102a31f34c62603a3f5976471e94a
Component: engine
2013-06-24 18:29:08 -07:00
9e3102fd11 Make term function consistent with each other
Upstream-commit: 672d3a6c6cd0494a0b8eaa13674c3cb87cba029c
Component: engine
2013-06-24 18:27:57 -07:00
40e51bbd8c Make DockerCli use its own stdin/out/err instead of the os.Std*
Upstream-commit: a749fb21309b147a1bb9da0838f591ba58f6d169
Component: engine
2013-06-24 18:27:57 -07:00
1553a048ac Fix issue when attaching stdin alone
Upstream-commit: 25d1bc2c09e3f6e7973d6b159e49ae7f8bd7670d
Component: engine
2013-06-24 18:27:57 -07:00
58d29f2b8c Bump version to 0.4.6
Upstream-commit: 9fe8bfb2bc4b00a69db16e04e45c065090d1af2d
Component: engine
2013-06-22 13:36:45 -07:00
9532506c90 Merge pull request #986 from dotcloud/bump_0.4.5
Bump version to 0.4.5
Upstream-commit: c792c0a6c9e110c082e61022cd53b725f150b410
Component: engine
2013-06-21 17:13:38 -07:00
ddee279309 Bump version to 0.4.5
Upstream-commit: f5d08fc49c48cda7fdce613a1cef57ed2b105abd
Component: engine
2013-06-21 17:01:01 -07:00
3f92ee019d merge master and add doc
Upstream-commit: 4d1692726b5e7cfc1b58245afc48c1591724369f
Component: engine
2013-06-22 01:08:20 +02:00
9d597b11de Merge pull request #848 from dotcloud/builder_server-3
Improve Docker build
Upstream-commit: de1a5a75cc5ae9d1084885d810d5715ee900f16d
Component: engine
2013-06-21 14:55:08 -07:00
32f89c6b42 Merge branch 'master' into fix-auth
Upstream-commit: 8f2a80804ce6f3ab77057a25180a27e3b346778b
Component: engine
2013-06-21 09:18:03 +00:00
7c517d635a Merge branch 'simpler-build-upload' (#900) into builder_server-3 (#848)
Upstream-commit: 352991bdf4c0a7702fcc791b961a516fb684f4c1
Component: engine
2013-06-20 22:02:36 -07:00
c29f5f7d2f Merge branch 'master' into simpler-build-upload
Conflicts:
	commands.go
Upstream-commit: 86e83186b5826e9ff4b11d3425a31a72a7535ea0
Component: engine
2013-06-20 20:25:59 -07:00
5f45c865b5 Use hijack for logs instead of stream
Upstream-commit: b419699ab8f79f4826ec94583c6f7a46f74eeaa2
Component: engine
2013-06-20 18:18:36 -07:00
37052c0a21 Bump version to 0.4.4
Upstream-commit: 02f0c1e46d1d73677aed899c1f0deaa69ab11ffc
Component: engine
2013-06-20 14:33:59 -07:00
931d03178d - Builder: hotfix for bug introduced in 3adf9ce04ef1632f82f7bd1585c135bb141aa450
Upstream-commit: dbfb3eb92391d90741be3238551a0fffcf2dbcdc
Component: engine
2013-06-20 14:29:34 -07:00
a4e9bba7a3 Merge branch 'master' into simpler-build-upload
Conflicts:
	api.go
	builder_client.go
	commands.go
Upstream-commit: e43323221b15d90956a200754bbf3e1d92d7bb1c
Component: engine
2013-06-20 14:19:09 -07:00
9322ac2e40 Bumped version to 0.4.3
Upstream-commit: da5bb4db96b369365c4b913d9009d8bb1d0f51f4
Component: engine
2013-06-20 12:23:14 -07:00
a1d1477844 Merge pull request #938 from dotcloud/add_unix_socket-feature
* Runtime: Add unix socket and multiple -H
Upstream-commit: fa68fe6ff3315757c1be60a3daf73f375974ddb5
Component: engine
2013-06-20 11:17:16 -07:00
9587bb386c Merge branch 'master' into builder_server-3
Conflicts:
	docs/sources/use/builder.rst
Upstream-commit: 659e8460060d2216329d874cf6617fc24ec479fd
Component: engine
2013-06-20 10:27:12 -07:00
50bb26ecb8 add ps -s
Upstream-commit: bd04d7d475e6497070b3144e6526566b066674cf
Component: engine
2013-06-20 14:19:50 +00:00
eb87dc37e0 Merge branch 'master' into simpler-build-upload
Upstream-commit: 79efcb545d76970843e02c48492a61450dba5564
Component: engine
2013-06-19 18:48:19 -07:00
901aace697 Merge branch 'master' into add_unix_socket-feature
Upstream-commit: d52af3f58f26c1bf1ea61af532385965434373eb
Component: engine
2013-06-19 12:49:27 +00:00
cbe318e165 add the possibility to use multiple -H
Upstream-commit: dede1585ee00f957e153691c464aab293c2dc469
Component: engine
2013-06-19 12:31:54 +00:00
9ed8c4d64b Merge branch 'master' into fix_detach_eof
Conflicts:
	commands.go
Upstream-commit: c063fc02387b232bff4720a7c8aab5f799f4a073
Component: engine
2013-06-18 17:15:31 -07:00
0d4d92aeeb Merge pull request #916 from dotcloud/race_attach-fix
- Runtime: Fix race condition within Run command when attaching.
Upstream-commit: 0a9ac63a051c1808c7b8ac3ba06ed44e5b86fd4d
Component: engine
2013-06-18 17:13:38 -07:00
61d11ddffb Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
Upstream-commit: 34a434616a7056a89328348ce3f92afd2730c777
Component: engine
2013-06-18 16:12:30 -07:00
2c3eeb1b3d Merge pull request #918 from dotcloud/hisotry_lookup
Add image lookup to history command
Upstream-commit: 32e8f9beca4c8a0c0b3e32b8d7ea4366067c3913
Component: engine
2013-06-18 15:36:05 -07:00
11334d506a add basic support for unix sockets
Upstream-commit: 3adf9ce04ef1632f82f7bd1585c135bb141aa450
Component: engine
2013-06-18 18:59:56 +00:00
531f894fab * API: Send all tags on History API call
Upstream-commit: 808faa6371c470fa0765f5d4e3aed7708d8f9ee6
Component: engine
2013-06-18 10:31:07 -07:00
ec13f22dbd Remove useless goroutine
Upstream-commit: 3dc93e390ad3d310dede84948b726ce67e261375
Component: engine
2013-06-18 10:10:03 -07:00
7bd657cfeb Remove useless goroutine
Upstream-commit: e2d034e48858d0afe9ee0f88f04e40cbf95ab8ba
Component: engine
2013-06-18 10:06:26 -07:00
43ecdc208f Merge branch 'master' into race_attach-fix
Upstream-commit: 86205540d8d28e4f070ece91712238212105ddf0
Component: engine
2013-06-18 10:03:34 -07:00
797aaaf7fe Packaging, issue 919: Bump version to 0.4.2
Upstream-commit: e664a46ff334ff9f7c8dfb438e15950e3cacf184
Component: engine
2013-06-17 19:50:31 -07:00
fb46f44c43 * Builder: upload progress bar
Fix progress bar
Upstream-commit: 0809f649d356b6b8d34a03bee8447049161ea09c
Component: engine
2013-06-17 18:49:16 -07:00
00bc56197b * API: Add tag lookup to history command. Fixes #882
Upstream-commit: 3bfc82257878e55141bb029390574130c3ac0530
Component: engine
2013-06-17 18:39:30 -07:00
5a843b1afc Remove Run race condition
Upstream-commit: 2b6ca3872883dcb487d8a39a1a8530be6a62f947
Component: engine
2013-06-17 15:45:08 -07:00
fa0630fa0a Move the attach prevention from server to client
Upstream-commit: c106ed32ea7613573a2081d47ad2498429ac86f2
Component: engine
2013-06-17 15:40:04 -07:00
74ed6f1501 - Runtime: Fixes #884 enforce stdout/err sync by merging the stream
Upstream-commit: 3a0ffbc77267e395676860db265ee3476c45b3c2
Component: engine
2013-06-17 14:44:35 -07:00
434fb6f49b Bumped version to 0.4.1
Upstream-commit: e8f001d45157f2f645e415543d7c3e7bf832c665
Component: engine
2013-06-17 19:15:21 +00:00