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
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
f26e4fdaf0
Fixed API version numbers in api docs
...
Upstream-commit: cff2187a4ccf90a5be821c316b564e934d80998c
Component: engine
2013-06-20 12:30:02 -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
1c0d014a0f
Merge pull request #941 from dotcloud/makefile_test_subpackages
...
gofmt and test sub directories in makefile
Upstream-commit: 930e1d883046c819a5b28d2ccef43fe4f7d0ebfc
Component: engine
2013-06-20 11:18:37 -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
4e81510bee
Merge pull request #907 from dotcloud/go1.1_cookie_jar-feature
...
* Runtime: use go 1.1 cookiejar and remove ResetClient
Upstream-commit: 21a5a6202dc7695b40a86ff82d63a888bca052ac
Component: engine
2013-06-20 10:48:36 -07:00
5503e64e8c
Merge pull request #961 from dotcloud/933-warning_rm-running
...
* Runtime: refuse to remove a running container
Upstream-commit: d8f56352da94fa70873bfb7fb27d59f46ebc743b
Component: engine
2013-06-20 10:25:02 -07:00
ee73e8c994
Merge pull request #913 from dotcloud/fix_detach_eof
...
- Runtime: Impossible to detach from attached container fix
Upstream-commit: d1a3d020aa7b843098aeb719e185cebf0822a3f2
Component: engine
2013-06-20 10:21:19 -07:00
517b92a681
Merge pull request #909 from dotcloud/fix_auth_tests
...
Fix the auth tests
Upstream-commit: 8807b7dd462ca634ccf399fab1a3d9b241b4b9c8
Component: engine
2013-06-20 10:14:55 -07:00
3cf5506959
Packaging|ubuntu, issue #960 : Add docker PPA staging in release process
...
Upstream-commit: d8887f34888c1e6c1a846d54e3e8afc4791d88d0
Component: engine
2013-06-20 08:57:28 -07:00
20435df2c1
add warning when you rm a running container
...
Upstream-commit: 1c841d4feed99ad568b7a5b04cedf8d65c3bb92c
Component: engine
2013-06-20 15:45:30 +00:00
b90fb28665
rebase master
...
Upstream-commit: 5f93aa0ecf26699d0e905811d9125081811093b7
Component: engine
2013-06-20 13:56:36 +00:00
e9a955e303
update docs
...
Upstream-commit: 05796bed57d4e1de352e02fcd6b28aed14f1b670
Component: engine
2013-06-20 12:34:08 +00:00
df019d0466
Merge pull request #948 from dotcloud/registry_pathencode
...
* Registry: Use opaque requests when we need to preserve urlencoding in registry requests
Upstream-commit: 8a131dffb6531d64f7ed1fefea5a5110dba29a56
Component: engine
2013-06-19 22:41:16 -07:00
eb87dc37e0
Merge branch 'master' into simpler-build-upload
...
Upstream-commit: 79efcb545d76970843e02c48492a61450dba5564
Component: engine
2013-06-19 18:48:19 -07:00
c7b40afdea
Packaging|ubuntu, issue #954 : Generate debian/changelog from main CHANGELOG.md
...
Upstream-commit: 88dcba3482df33f47a0b89c0811a96abf0609840
Component: engine
2013-06-19 16:32:51 -07:00
b84c59c43b
Merge pull request #945 from globalcitizen/master
...
Security warnings in LXC configuration
Upstream-commit: 754609ab697df644b39c557607cff111e91ee495
Component: engine
2013-06-19 15:06:48 -07:00
f576f996f6
* Remote API: updated docs for 1.3
...
Upstream-commit: d6ab71f450ac3673ffd4bc806de23e42a6d32c07
Component: engine
2013-06-19 15:03:33 -07:00
a327fa094d
* Builder: remove duplicate unit test
...
Upstream-commit: 55edbcd02fe5d519069677c3970ea90e9973a4eb
Component: engine
2013-06-19 14:59:42 -07:00
f1b51af018
*Builder: warn pre-1.3 clients that they need to upgrade. This breaks semver, but our API should still be in 0.X versioning, in which case semver allows breaking changes.
...
Upstream-commit: 90dde9beabcac3874a274f9f7952f25ba8c1c7a3
Component: engine
2013-06-19 14:59:28 -07:00
575d367f53
Merge pull request #951 from dotcloud/add-fix
...
* Builder: correct the behavior of ADD when copying directories.
Upstream-commit: 9c8085a0aadcfc21950c234d7f3043807b138bc7
Component: engine
2013-06-19 14:36:09 -07:00
937f62ca0a
* Builder: correct the behavior of ADD when copying directories.
...
Upstream-commit: 507ea757a5d72af47b37af0e384e83fcea613a7b
Component: engine
2013-06-19 14:26:11 -07:00
9b7da2ae1e
Merge pull request #917 from dotcloud/pull_pool
...
- Runtime: Forbid parralel push/pull for a single image/repo. Fixes #311
Upstream-commit: 7e065aaacd35f0db675c4699c846e01314b18765
Component: engine
2013-06-19 14:11:29 -07:00
c4347cd657
Use opaque requests when we need to preserve urlencoding in registry requests
...
Upstream-commit: 0312bbc535de01cade67299dd41a69935c7241ba
Component: engine
2013-06-19 13:49:45 -07:00
606a85a77c
Merge pull request #924 from eliasp/remove-ifconfig-usage
...
* Documentation: replace `ifconfig` in docs with `iproute`
Upstream-commit: a056f1deeceac20a9212570ea8448911e3f0d1ed
Component: engine
2013-06-19 13:20:35 -07:00
49aceb894c
Merge pull request #944 from hansent/patch-1
...
* Documentation: use https repo url to clone for dev setup instructions
Upstream-commit: fdaefe6997a0741e37e3a12e3c3c86c33bf22987
Component: engine
2013-06-19 13:17:08 -07:00
a1b0b51b91
batch apt-get install operations for speed
...
The dockerbuilder Dockerfile was installing one package per apt-get
install operation.
This changes it so that consecutive run apt-get install operations are
batched into a single operation.
Upstream-commit: 88279439af6b5196aaeb9bcb3d7a7154be04d4bc
Component: engine
2013-06-19 22:07:56 +03:00
df7ed98feb
add testall rule
...
Upstream-commit: 2d6a49215c15e7649f8b041e5a04e75b4d360c94
Component: engine
2013-06-19 18:21:53 +00:00
e35a6b3cf9
hotfix: nil pointer uppon some registry error
...
Upstream-commit: a7e14a3065ccd97fcd77b4038abdf30bee78a2b4
Component: engine
2013-06-19 11:08:19 -07:00
286eece9f4
Add note about lxc.cap.keep > lxc.cap.drop
...
Upstream-commit: 788d66f409ce3a7e464bbb68d909960648f2515c
Component: engine
2013-06-20 00:39:35 +07:00
903c80e7d6
Add healthy procfs/sysfs warnings
...
Upstream-commit: 96988a37f52b65e8b703b6c2de138c34486215ad
Component: engine
2013-06-20 00:37:08 +07:00
f245288e89
Merge branch 'master' into fix-add-behavior
...
Upstream-commit: b368d21568ae12f7a7b7fe5e0afd0460e2057d78
Component: engine
2013-06-19 10:31:50 -07:00
f5f2d8e1e0
use https repo url to clone for dev setup instructions
...
the git clone line in the dev setup instructions does not work as is, unless the user has write access
Upstream-commit: c88b763e80d6ad0253da060896da10d60f58f829
Component: engine
2013-06-19 11:38:58 -05:00
1644bb786c
Merge pull request #849 from dotcloud/improve_progressbar_pull
...
* Client: HumanReadable ProgressBar sizes in pull
Upstream-commit: ec3c89e57c3e91fabb9b084a2762faa20ca720ec
Component: engine
2013-06-19 08:02:40 -07:00
e55048dc4d
gofmt and test sub directories in makefile
...
Upstream-commit: 5dcab2d361956e75d00d5bee18371395f17a663f
Component: engine
2013-06-19 14:50:58 +00:00
07744913a6
Merge pull request #930 from andrewmunsell/patch-1
...
Fix Mac OS X installation instructions URL
Upstream-commit: 5f7e98be20e9382b0cae6b89bb7bf57d9e83d6ae
Component: engine
2013-06-19 07:31:24 -07:00
901aace697
Merge branch 'master' into add_unix_socket-feature
...
Upstream-commit: d52af3f58f26c1bf1ea61af532385965434373eb
Component: engine
2013-06-19 12:49:27 +00:00
bdd6ad8a7a
update docs
...
Upstream-commit: 063c838c927615e9507eca2a5c2f38a5fc4c35b2
Component: engine
2013-06-19 12:48:50 +00:00
8ec498cc12
add tests
...
Upstream-commit: 9632bf228744dddfae2c303a0f2e8b962b6e0673
Component: engine
2013-06-19 12:40:01 +00:00
cbe318e165
add the possibility to use multiple -H
...
Upstream-commit: dede1585ee00f957e153691c464aab293c2dc469
Component: engine
2013-06-19 12:31:54 +00:00
41c1e7ceb7
* Builder: fixed the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented.
...
Upstream-commit: 5be7b9af3ee9b884482220979735e2a8ea969ce3
Component: engine
2013-06-18 20:28:49 -07:00
e0eb4c405e
Merge pull request #788 from samjsharpe/master
...
Vagrantfile: Add support for VMWare Fusion provider
Upstream-commit: 0ae778c8812fa7adfece0dd37ef82d7970431f06
Component: engine
2013-06-18 18:35:25 -07:00
6df91ed398
Fix Mac OS X installation instructions URL
...
Upstream-commit: 1f8b679b18984eeecc98d6de79a77cbd405cd56d
Component: engine
2013-06-18 19:19:07 -06:00
85dd5013c2
Merge pull request #885 from dotcloud/remove_bsdtar
...
* Runtime: Remove bsdtar dependency
Upstream-commit: ee5df765796cfbeade482652e4c5d928c82af6d1
Component: engine
2013-06-18 17:24:26 -07:00
