1f46dfdd51
Add \r to error message in run raw mode
...
Upstream-commit: c2c72bcfd796a43b9be33705ec695455c9823489
Component: engine
2013-04-13 15:03:24 -07:00
80ab61361c
Merge remote-tracking branch 'origin/96-dns_issue-fix'
...
Upstream-commit: cdf90bb04b046058f6b1233846a1d5eb4fcf3810
Component: engine
2013-04-12 17:50:59 -07:00
1875a00c38
Allow use to set his own dns via -dns
...
Upstream-commit: 7673afc8438a9e46a1d11aff0f8c0f7eca169809
Component: engine
2013-04-12 10:43:13 -07:00
c74dd47b04
Fixed wording of ghost-related messages
...
Upstream-commit: b1fbebb4a3611d340176ad637a22d2250085a077
Component: engine
2013-04-12 10:39:08 -07:00
9c360e79b0
Merge remote-tracking branch 'origin/ghost_handling-fix'
...
Upstream-commit: 3527291b477510b1b9f904988599b6499211c3f3
Component: engine
2013-04-12 10:33:36 -07:00
5137cc3f51
Merge remote-tracking branch 'origin/kill_behaviour_fix'
...
Upstream-commit: 57d31c9777a5f79ffe56dd813e61ad1eace6d59d
Component: engine
2013-04-12 10:20:26 -07:00
9b95a8b869
Update AUTHORS
...
Upstream-commit: 343ed6b53f225e35bb5464efb556f555a31056a1
Component: engine
2013-04-12 10:44:50 -04:00
ebb6835d20
Go fmt
...
Upstream-commit: 22893429ed29dbb7a01eed7a90a4d1fbecfd5d90
Component: engine
2013-04-12 07:37:24 -07:00
b4724f4f76
Merge branch 'create_pidfile' of https://github.com/flavio/docker into flavio-create_pidfile
...
Upstream-commit: c1703c2b68da74680310ae58f5368d6c677a68ef
Component: engine
2013-04-12 07:28:36 -07:00
1568d28853
Merge pull request #381 from dotcloud/371-add-l-ps
...
Add options to docker ps
Upstream-commit: a8c15477d95c6a3b1bc81fdb1662c8196a1b6007
Component: engine
2013-04-12 07:16:00 -07:00
62557298dd
Merge pull request #395 from dotcloud/commands_usage-fix
...
fixes some usages (multiple parameters mostly)
Upstream-commit: 9d03b2bb6265dd5a0dc097bf3382bd2dd1762bec
Component: engine
2013-04-12 07:03:36 -07:00
b5ccb3f71c
removed not needed [OPTIONS] and remove poor messages like 'Not enough arguments'
...
Upstream-commit: 8987bd5832d8162805d34b89c567fcf2e933f746
Component: engine
2013-04-12 12:26:31 +02:00
34381c942f
Add unit test for hanging kill + fix other tests behaviour
...
Upstream-commit: bb22cd492efdc67855bbcf8ab4a669e45ea9ee8e
Component: engine
2013-04-11 16:21:19 -07:00
1296a36fab
Merge pull request #386 from lopter/master
...
Use ip to setup the gateway in sysinit.go
Upstream-commit: 27be5aec74773100f3e59c432a737cb712c8b368
Component: engine
2013-04-11 15:02:20 -07:00
c1ad596926
Added docker-build (formerly github.com/shykes/changer) as a contrib script
...
Upstream-commit: 048f9f4974ac74fac3b03af132c392daaa9f134e
Component: engine
2013-04-11 14:44:39 -07:00
7f83ef43de
docker daemon: create file containing PID
...
Ensure the docker daemon creates a file containing its PID under
/var/run/docker.pid.
The daemon takes care of removing the pid file when it receives either
SIGTERM, SIGINT or SIGKILL.
The daemon also refuses to start when the pidfile is found. An
explanation message is shown to the user when this happens.
This change is required to make docker easier to manage by tools like
checkproc which rely on this information.
Upstream-commit: fb0b375be70e79eaa8349143dceef048db6e0e19
Component: engine
2013-04-11 21:41:08 +02:00
2f118e2b3a
Simplify the output of 'docker images' by removing the PARENT column
...
Upstream-commit: 79d934bfb0d2e5d30a89a42c1a106d9d3698775b
Component: engine
2013-04-11 12:11:41 -07:00
855acfb07d
Merge remote-tracking branch 'origin/148-remove_repositories-feature'
...
Upstream-commit: 54dfedc516918b9c0f343dbb09ce2e9cc17c4e61
Component: engine
2013-04-11 11:36:28 -07:00
47db51b4c0
Merge remote-tracking branch 'origin/crlf_on_raw_mode'
...
Upstream-commit: 0eb7157b6f23a70da2568796344bd6b333944aac
Component: engine
2013-04-11 11:31:17 -07:00
d6545d6e21
Contrib post-commit hook for checking gofmt
...
Upstream-commit: 2de953490d6a4ccba9668484fce1f028578c6f77
Component: engine
2013-04-11 11:30:35 -07:00
2470a0415a
fixes some usages
...
Upstream-commit: 3ba44d2d5fac067f7fcd3d5abed83b08c8ddb24d
Component: engine
2013-04-11 18:46:47 +02:00
c36cca18b4
Detect and mark ghost container.
...
Upstream-commit: 313d13ea01f58c3e611fb85e435d36dd4907a6ac
Component: engine
2013-04-11 09:26:17 -07:00
46c83a02af
force kill now use lxc-kill. Fixes #383
...
Upstream-commit: e68c04b722b4c001c999abc2cd5b60b1f1b34457
Component: engine
2013-04-11 09:04:04 -07:00
0823d282a2
display usage when no parameter
...
Upstream-commit: c105049f7ea5927ec9d7258624391f6a2b43a6a3
Component: engine
2013-04-11 16:27:01 +02:00
556b0802fe
snake_case to camelCase
...
Upstream-commit: 17136d58f29fdd921d41ebd7c67c73bd4078b023
Component: engine
2013-04-11 13:09:40 +02:00
d2aba9b356
Use crlf in registry function to avoid issue with autlogin in push and autopull in run
...
Upstream-commit: 6dc4c74b5ab63e6de374fe839e05acf5998a6f72
Component: engine
2013-04-10 19:13:15 -07:00
1dcc582981
use crlf in login in order to avoir issue due to real raw mode
...
Upstream-commit: 9d1fd2317d5e3edee845410f10969b37ba37c9d5
Component: engine
2013-04-10 19:08:46 -07:00
4af9c309f0
Put the resolv.conf path in a variable instead of being hardcoded within lxc
...
Upstream-commit: 1f9f5eed5d004395886b8e93cec9389332d8fded
Component: engine
2013-04-10 18:23:34 -07:00
7d008a24f8
Use ip to setup the gateway in sysinit.go
...
ip from iproute2 replaces the legacy route tool which is often not
installed by default on recent Linux distributions.
The same patch has been done in network.go and is re-used here.
Upstream-commit: 5e1a975b48c1d4e6743f68ca770f8fe06fb32ce4
Component: engine
2013-04-10 17:40:28 -07:00
bcc22cca7d
Allow rmi to remove image from its name
...
Upstream-commit: 97f48e59fcfa8ca0f0a20ed80cab7330af93ae6d
Component: engine
2013-04-10 17:23:42 -07:00
4fbbe500d2
Added temporary spec for data volumes as requested on #111
...
Upstream-commit: e41fd24542d96c503cd923a403c43aceaf9af965
Component: engine
2013-04-10 13:57:26 -07:00
053e80b29d
changed last to n
...
Upstream-commit: 8bd192fb16a5ac9836d4b1d3df037af65b61ffce
Component: engine
2013-04-10 21:09:21 +02:00
551b762e13
add -l to docker ps
...
Upstream-commit: 8c3331dc978e3cbbe3255a436c8f18f01158eb27
Component: engine
2013-04-10 19:30:57 +02:00
884a342273
Merge pull request #372 from srid/goroutine-scope
...
serve goroutine must refer to the local conn
Upstream-commit: f507188ddc907f7e7b628145a89e455a5eeacc28
Component: engine
2013-04-09 21:06:31 -07:00
63abdc99ee
Merge remote-tracking branch 'origin/wait_non_existing_container-fix'
...
Upstream-commit: 76b7b2adf765732f8a43d7536e9720d2b4f3f6bb
Component: engine
2013-04-09 21:05:15 -07:00
e53c739014
Make sure all containers (even previously stopped) get a correct wait lock
...
Upstream-commit: 9f83b9df2256c7b34453d5da85c17fae516ee3a4
Component: engine
2013-04-09 17:40:02 -07:00
aa4c6e3497
incorporate feedback for improving the PR
...
Upstream-commit: 4ab241c93080d8df6db4fd0c31b0c26008118422
Component: engine
2013-04-09 18:04:01 -04:00
2f21f794cf
serve goroutine must refer to the local conn
...
Upstream-commit: f731835e4577c414d37fa050aaec1f541511ff6b
Component: engine
2013-04-09 15:00:05 -07:00
bdbf282ee6
Merge github.com:dotcloud/docker into 333-redis-documentation
...
Upstream-commit: 418ef43fbb59d62dca20905bbc0753892ecb6c27
Component: engine
2013-04-09 16:07:40 -04:00
58a81e417b
Bumped version to 0.1.4
...
Upstream-commit: 40ebe78bb1d9750505d594d10bc9eb6979ef63ea
Component: engine
2013-04-09 13:00:50 -07:00
5936316577
Merge remote-tracking branch 'origin/disable_signals-create_escape_sequence'
...
Upstream-commit: 1b7115a33772806b36006f66b4425149f2fb3123
Component: engine
2013-04-09 12:56:32 -07:00
e3aae801dc
Update README with escape sequence
...
Upstream-commit: 2e6a5bc7ee932b3d723ca4b0a319477310b12c34
Component: engine
2013-04-09 12:55:26 -07:00
d00cf2eba1
Fix merge issue
...
Upstream-commit: 72cef46e5e504355266b9c83bd3693d07a35d0ee
Component: engine
2013-04-09 12:55:26 -07:00
4a464fa427
Use integers instead of non-printable chars in the escape sequence detection
...
Upstream-commit: 626bfd87a7eadd64b16fb02d547f75d1a8f94aa7
Component: engine
2013-04-09 12:55:26 -07:00
086efb3f6d
Remove unused optimization that could lead in loosing the escape sequence
...
Upstream-commit: 8f41f1fa60587d77ad3ce2109fc03180488f49cc
Component: engine
2013-04-09 12:55:26 -07:00
6c8223ce20
Look for the escape sequence only in tty mode
...
Upstream-commit: faa88436504e4a4a63ddb4f3736b11e721b760cd
Component: engine
2013-04-09 12:55:17 -07:00
a19d2a32c2
Fix deadlock on stop failure
...
Upstream-commit: 0d9e54367f7bf7da9670de723d533eaa920868c8
Component: engine
2013-04-09 12:06:01 -07:00
9ea0876e63
Implement an escape sequence in order to be able to detach from a container
...
Upstream-commit: 1f70b1e15d0dea5f36395d325cbac2892e4f2e8a
Component: engine
2013-04-09 11:06:17 -07:00
9b1bdc42ec
Disable signal catching and enable real posix raw mode
...
Upstream-commit: 3f63b8780765df735192ea0299e86e8cb7dbcb88
Component: engine
2013-04-09 11:06:17 -07:00
d3c4d21c19
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 9c3d2b6a4ed46eb3549416ceffd61683ad0a8efe
Component: engine
2013-04-09 11:02:43 -07:00
