Victor Vieux
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
Victor Vieux
b15d1e7cb5
fix doc post
...
Upstream-commit: 8e7d4cda078482b84836f51e3e7ce17aa0f65217
Component: engine
2013-06-21 11:13:13 +02:00
Victor Vieux
3574da6a31
inverse if
...
Upstream-commit: 5b3ad0023b95823f15fe72605fa9b2786ce5035b
Component: engine
2013-06-21 09:06:09 +00:00
unclejack
3b9f55c51c
docs: mark command as optional for docker run
...
Upstream-commit: 6a1279fb90ad33fec05a48529981db7bb093b782
Component: engine
2013-06-21 11:07:14 +03:00
unclejack
f8fc85e9e7
mark command as optional for docker run
...
Upstream-commit: 66910a76027d3e37b6a96c0bd1106cfd5d27ba40
Component: engine
2013-06-21 11:06:41 +03:00
Solomon Hykes
b61b5ee65f
- Builder: return an error when the build fails
...
Upstream-commit: d9bce2defd56bbc47f47b263257b64016e48d607
Component: engine
2013-06-20 22:15:19 -07:00
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
e7c463fd8e
Merge pull request #972 from titanous/update-authors
...
Update AUTHORS
Upstream-commit: 17489cac1a05a47913897a016e973889fc42c781
Component: engine
2013-06-20 20:42:52 -07:00
Solomon Hykes
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
Jonathan Rudenberg
d12d87ce31
Update AUTHORS
...
Upstream-commit: b0b690cf23871d36e1f981fcee6cb929158c4fee
Component: engine
2013-06-20 23:29:20 -04:00
Solomon Hykes
c29f5f7d2f
Merge branch 'master' into simpler-build-upload
...
Conflicts:
commands.go
Upstream-commit: 86e83186b5826e9ff4b11d3425a31a72a7535ea0
Component: engine
2013-06-20 20:25:59 -07:00
Solomon Hykes
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
Jonathan Rudenberg
9cf4a66364
Remove code unreachable using Go 1.1
...
Upstream-commit: 50b70eeb6830040db73c8b2b389d881a3200de8d
Component: engine
2013-06-20 23:19:44 -04:00
Solomon Hykes
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
Solomon Hykes
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
Guillaume J. Charmes
5f45c865b5
Use hijack for logs instead of stream
...
Upstream-commit: b419699ab8f79f4826ec94583c6f7a46f74eeaa2
Component: engine
2013-06-20 18:18:36 -07:00
Guillaume J. Charmes
1c06271442
remove unused files
...
Upstream-commit: 08825fa611cf5067b99bed452ffe6320ed00003a
Component: engine
2013-06-20 16:31:11 -07:00
Solomon Hykes
37052c0a21
Bump version to 0.4.4
...
Upstream-commit: 02f0c1e46d1d73677aed899c1f0deaa69ab11ffc
Component: engine
2013-06-20 14:33:59 -07:00
Eric Myhre
ffff9b2ac4
Add argument to allow setting base directory for docker daemon's storage to values other than "/var/lib/docker".
...
Upstream-commit: e44f62a95cc8f3cab446205d66450ee37911e29c
Component: engine
2013-06-20 16:29:54 -05:00
Solomon Hykes
931d03178d
- Builder: hotfix for bug introduced in 3adf9ce04ef1632f82f7bd1585c135bb141aa450
...
Upstream-commit: dbfb3eb92391d90741be3238551a0fffcf2dbcdc
Component: engine
2013-06-20 14:29:34 -07:00
Solomon Hykes
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
Fabrizio Regini
14a2941f2c
Update README.md
...
Upstream-commit: da063497232ebe7202b1c7a0c5ecdecaccb3681b
Component: engine
2013-06-20 23:15:38 +02:00
Solomon Hykes
f26e4fdaf0
Fixed API version numbers in api docs
...
Upstream-commit: cff2187a4ccf90a5be821c316b564e934d80998c
Component: engine
2013-06-20 12:30:02 -07:00
Guillaume J. Charmes
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
Guillaume J. Charmes
9322ac2e40
Bumped version to 0.4.3
...
Upstream-commit: da5bb4db96b369365c4b913d9009d8bb1d0f51f4
Component: engine
2013-06-20 12:23:14 -07:00
Daniel Mizyrycki
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
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Solomon Hykes
c95a11fa88
Makefile: added missing -a option
...
Upstream-commit: db60337598d264dc02d67e0dde93b300bf971903
Component: engine
2013-06-20 10:39:09 -07:00
Guillaume J. Charmes
85aee63ed2
Add link flags in order to link statically and without debug symbols
...
Upstream-commit: c5be64fec478f5081a06480951811d30753fc46a
Component: engine
2013-06-20 10:33:54 -07:00
Guillaume J. Charmes
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
Solomon Hykes
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
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Daniel Mizyrycki
bf26b982df
Merge pull request #962 from dotcloud/960-packaging-ubuntu
...
Packaging|ubuntu, issue #960 : Add docker PPA staging in release process
Upstream-commit: cd155a1f256b14b962771ab603bca825e67b5e95
Component: engine
2013-06-20 09:03:15 -07:00
Daniel Mizyrycki
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
Victor Vieux
20435df2c1
add warning when you rm a running container
...
Upstream-commit: 1c841d4feed99ad568b7a5b04cedf8d65c3bb92c
Component: engine
2013-06-20 15:45:30 +00:00
Victor Vieux
63220aff61
use strconv.ParseBool in getBoolParam
...
Upstream-commit: da199846d2813467ab8bae629336f3989f285ce9
Component: engine
2013-06-20 14:34:58 +00:00
Victor Vieux
50bb26ecb8
add ps -s
...
Upstream-commit: bd04d7d475e6497070b3144e6526566b066674cf
Component: engine
2013-06-20 14:19:50 +00:00
Victor Vieux
b90fb28665
rebase master
...
Upstream-commit: 5f93aa0ecf26699d0e905811d9125081811093b7
Component: engine
2013-06-20 13:56:36 +00:00
Victor Vieux
e9a955e303
update docs
...
Upstream-commit: 05796bed57d4e1de352e02fcd6b28aed14f1b670
Component: engine
2013-06-20 12:34:08 +00:00
Solomon Hykes
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
Solomon Hykes
eb87dc37e0
Merge branch 'master' into simpler-build-upload
...
Upstream-commit: 79efcb545d76970843e02c48492a61450dba5564
Component: engine
2013-06-19 18:48:19 -07:00
Daniel Mizyrycki
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
Guillaume J. Charmes
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
Solomon Hykes
f576f996f6
* Remote API: updated docs for 1.3
...
Upstream-commit: d6ab71f450ac3673ffd4bc806de23e42a6d32c07
Component: engine
2013-06-19 15:03:33 -07:00
Solomon Hykes
a327fa094d
* Builder: remove duplicate unit test
...
Upstream-commit: 55edbcd02fe5d519069677c3970ea90e9973a4eb
Component: engine
2013-06-19 14:59:42 -07:00