Commit Graph

2141 Commits

Author SHA1 Message Date
58d29f2b8c Bump version to 0.4.6
Upstream-commit: 9fe8bfb2bc4b00a69db16e04e45c065090d1af2d
Component: engine
2013-06-22 13:36:45 -07:00
ebda9dc688 - Runtime: add regression test for issue #995
Upstream-commit: f9acd605dcd48037d61c4f5cd114bca41e147b9e
Component: engine
2013-06-22 13:33:43 -07:00
692004c87b Fix a bug which caused creation of empty images (and volumes) to crash. FIxes #995.
Upstream-commit: 290b1973a90e39f2b7f751f038633b9e6e4a1694
Component: engine
2013-06-22 12:29:42 -07:00
487534c5cb Fix formatting in Changelog
Upstream-commit: ecd1fff9b001a0379d06d0d115da5106c66056e7
Component: engine
2013-06-21 20:22:14 -06:00
bad2357f84 Merge pull request #988 from dotcloud/526-packaging-ubuntu
Packaging|Ubuntu, issue #526: Follow init permission pattern for docker.conf
Upstream-commit: b0f12bd5e8381e207bac148f161ced4a04218361
Component: engine
2013-06-21 18:03:12 -07:00
84fd5a5a9e Packaging|Ubuntu, issue #526: Follow init permission pattern for docker.conf
Upstream-commit: 5d61ec11e35f22f6e89f24b5186c7697cb187165
Component: engine
2013-06-21 17:57: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
a02500ec05 Small copy improvements in Changelog
Upstream-commit: d9d2540162a79e08d9bc84b16b6e9a91ea91d56e
Component: engine
2013-06-21 17:09:49 -07:00
ddee279309 Bump version to 0.4.5
Upstream-commit: f5d08fc49c48cda7fdce613a1cef57ed2b105abd
Component: engine
2013-06-21 17:01:01 -07:00
5b6afd3aa9 Merge pull request #959 from dotcloud/947-add_ps_size_option
+ Client: Add docker ps -s option to display containers' sizes
Upstream-commit: b24759af1cae17963779ec15c70f5b45ddaf904d
Component: engine
2013-06-21 16:10:45 -07:00
3f92ee019d merge master and add doc
Upstream-commit: 4d1692726b5e7cfc1b58245afc48c1591724369f
Component: engine
2013-06-22 01:08:20 +02:00
b45a456a15 consistent codebase fix
Upstream-commit: 1581ed52ba07a869b5902afbb7c7bb01bb1e4a63
Component: engine
2013-06-21 22:55:33 +00: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
7ab6c2d54d Remove deprecated INSERT from documentation
Upstream-commit: 169ef21de768a45805f2afc56b3e5c6f21130b92
Component: engine
2013-06-21 14:12:52 -07:00
b6d1924c7d Update api docs
Upstream-commit: d0fa6927f8ad87e73a02f64ae9d6db6a820c1f4c
Component: engine
2013-06-21 13:51:48 -07:00
965a3d343a Merge pull request #970 from titanous/go1.1-unreachable
Remove code unreachable using Go 1.1
Upstream-commit: 63e8a4ac7441ac4af5ca8fdf05f44e9a8a7fc623
Component: engine
2013-06-21 10:44:40 -07:00
78880cab1c Merge pull request #980 from ToothlessGear/fix-progressbar
* Client: fix progressbar output
Upstream-commit: 459230d3f9db142b19c44a680a71c23dcc65aca4
Component: engine
2013-06-21 10:42:14 -07:00
58b777a3ce Merge pull request #975 from unclejack/891-mark_command_as_optional
891 mark command as optional for docker run
Upstream-commit: 070e1aec7e1e308409dfd9132034ae4101d52977
Component: engine
2013-06-21 10:22:52 -07:00
f0b6132493 Client: better progressbar output
Upstream-commit: 3ac68f1966222d9a1c0ff867515e3f5c2f83e422
Component: engine
2013-06-21 17:19:27 +02:00
162b88e0bd Merge pull request #801 from dotcloud/build_docker_static
* Makefile: Add link flags in order to link statically and without debug symbols
Upstream-commit: 5ccde4dffc836fb0c6ea967d5d61920edfb65bd0
Component: engine
2013-06-21 02:30:57 -07:00
eb8ac2846d Merge pull request #888 from dotcloud/fix-auth
* Auth: fix auth small issue in case you change your password on index.io
Upstream-commit: dc847001a5f17668347052a5146edc4ed3fe8c68
Component: engine
2013-06-21 02:22:01 -07:00
d6ca59c4cd fix tests
Upstream-commit: 639833aaf53d741176e0b4f817cbbf5a5da24037
Component: engine
2013-06-21 09:20:57 +00:00
32f89c6b42 Merge branch 'master' into fix-auth
Upstream-commit: 8f2a80804ce6f3ab77057a25180a27e3b346778b
Component: engine
2013-06-21 09:18:03 +00:00
eefe3fc276 Merge pull request #976 from dotcloud/fix_doc_post
fix typo in documentation
Upstream-commit: 78842970cf7ded82b055d273fbc40829cdcdd9dc
Component: engine
2013-06-21 02:14:39 -07:00
b15d1e7cb5 fix doc post
Upstream-commit: 8e7d4cda078482b84836f51e3e7ce17aa0f65217
Component: engine
2013-06-21 11:13:13 +02:00
3574da6a31 inverse if
Upstream-commit: 5b3ad0023b95823f15fe72605fa9b2786ce5035b
Component: engine
2013-06-21 09:06:09 +00:00
3b9f55c51c docs: mark command as optional for docker run
Upstream-commit: 6a1279fb90ad33fec05a48529981db7bb093b782
Component: engine
2013-06-21 11:07:14 +03:00
f8fc85e9e7 mark command as optional for docker run
Upstream-commit: 66910a76027d3e37b6a96c0bd1106cfd5d27ba40
Component: engine
2013-06-21 11:06:41 +03:00
b61b5ee65f - Builder: return an error when the build fails
Upstream-commit: d9bce2defd56bbc47f47b263257b64016e48d607
Component: engine
2013-06-20 22:15:19 -07: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
125ad1324c Merge pull request #953 from rhysh/952-swapaccount-docs
- Documentation: fix inconsistent/outdated instructions for setting up "swapaccount"
Upstream-commit: 4383d7b603c873d38e4637a34c92c927bda4e7aa
Component: engine
2013-06-20 20:49:44 -07:00
67ce6aa63e Merge pull request #965 from freegenie/patch-1
* Documentation: use sudo for quick install script
Upstream-commit: 89ae56820a9f46428e3b9c9ec0d379a26b269a3f
Component: engine
2013-06-20 20:48:42 -07:00
e7c463fd8e Merge pull request #972 from titanous/update-authors
Update AUTHORS
Upstream-commit: 17489cac1a05a47913897a016e973889fc42c781
Component: engine
2013-06-20 20:42:52 -07:00
e7457bd29b Merge branch 'build-add-file' into simpler-build-upload
Conflicts:
	buildfile_test.go
Upstream-commit: c1a5318d8eb58d58aa7de2cf1d73f6612665d242
Component: engine
2013-06-20 20:42:19 -07:00
d12d87ce31 Update AUTHORS
Upstream-commit: b0b690cf23871d36e1f981fcee6cb929158c4fee
Component: engine
2013-06-20 23:29:20 -04: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
7a7ea60289 - Builder: fixed a regression in ADD. Improved regression tests for build behavior.
Upstream-commit: 36d610a38806feb4cb5d09c4705a6f1fff42ef04
Component: engine
2013-06-20 20:20:16 -07:00
9cf4a66364 Remove code unreachable using Go 1.1
Upstream-commit: 50b70eeb6830040db73c8b2b389d881a3200de8d
Component: engine
2013-06-20 23:19:44 -04:00
99b7da757b * Builder: simplified unit tests. The tests are now embedded in the build itself. Yeah baby.
Upstream-commit: cc0f59742f192ccbc178c59bdc7eb98d0f6dd943
Component: engine
2013-06-20 20:16:39 -07:00
898e0a9c49 Merge pull request #969 from dotcloud/fix_logs
- Remote API: Fix a bug which caused 'docker logs' to fail
Upstream-commit: 09dd7f14deea49d901c0446b3c2f3380bbeee64a
Component: engine
2013-06-20 18:33:33 -07:00
5f45c865b5 Use hijack for logs instead of stream
Upstream-commit: b419699ab8f79f4826ec94583c6f7a46f74eeaa2
Component: engine
2013-06-20 18:18:36 -07:00
1c06271442 remove unused files
Upstream-commit: 08825fa611cf5067b99bed452ffe6320ed00003a
Component: engine
2013-06-20 16:31:11 -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
14a2941f2c Update README.md
Upstream-commit: da063497232ebe7202b1c7a0c5ecdecaccb3681b
Component: engine
2013-06-20 23:15:38 +02:00
f26e4fdaf0 Fixed API version numbers in api docs
Upstream-commit: cff2187a4ccf90a5be821c316b564e934d80998c
Component: engine
2013-06-20 12:30:02 -07:00
62bd6a487b Merge pull request #950 from dotcloud/bump_0.4.3
Bumped version to 0.4.3
Upstream-commit: a078d3c8728acbc2e104951037bc2f7ece57d1e9
Component: engine
2013-06-20 12:24:55 -07:00
9322ac2e40 Bumped version to 0.4.3
Upstream-commit: da5bb4db96b369365c4b913d9009d8bb1d0f51f4
Component: engine
2013-06-20 12:23:14 -07:00
c57dee8ab0 Merge pull request #946 from unclejack/speed_up_dockerbuilder_image_creation
dockerbuilder : batch apt-get install operations for speed
Upstream-commit: 1b19939742cf26ded8303e9a961f1a7bfe19b32c
Component: engine
2013-06-20 11:51:43 -07:00