Commit Graph

21804 Commits

Author SHA1 Message Date
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
2bb40279d3 Merge pull request #392 from dotcloud/rm_usage-fix
Display usage when no parameter in docker rm
Upstream-commit: c902c43766641eeba73aea2d9f96601394157d7d
Component: engine
2013-04-11 07:56:46 -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
5d8f85d0ac packaging; issue #251: Add debian packaging
Upstream-commit: 8ea1e9126f3d64216e2d8a91ce6f8ad1f3d8587c
Component: engine
2013-04-10 21:00:39 -07:00
05958e6932 Skeleton of http API
Upstream-commit: 38e2d00199db5dabe9972ff9c3153ac6b63266f2
Component: engine
2013-04-10 19:48:21 -07: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
226b7e3c89 testing: Make postcommit more generic
Upstream-commit: d2c1850fb5a210d59b87dcb8504c8c24b60cca3c
Component: engine
2013-04-10 11:32:48 -07: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
a6a98ff910 Merge pull request #377 from jbarbier/buildbot
Fix the Makefile, rule=hack to make it work on Windows
Upstream-commit: cb68662b9bea7dbd53296e9f0129cdac9131b688
Component: engine
2013-04-09 20:53:29 -07:00
05a22d6527 Fix the Makefile, rule=hack to make it work on Windows
Upstream-commit: b7cda3288ed857e4e2155846090b17a2d8fccdbf
Component: engine
2013-04-09 19:07:50 -07:00
3e6a546aa8 Merge pull request #367 from johncosta/333-redis-documentation
Add documentation for running a redis process with docker
Upstream-commit: a1f54cad6cc66d0a84b0bf0cc427fe40ba6448d3
Component: engine
2013-04-09 18:16:39 -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
263f9f8591 testing: Add buildbot VM
Upstream-commit: bbaa975ec8ea44f7df4f96a910360abc43b4d5f7
Component: engine
2013-04-09 14:37:37 -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
d7b36b0c91 Merge remote-tracking branch 'origin/change_run_detach_behavious_tty_mode'
Upstream-commit: 1716fccbccb108383345b352ab8d3c66423319aa
Component: engine
2013-04-09 10:39:13 -07:00
c0f86c8179 Merge pull request #363 from dhrp/docs
Added code and color for 'note' and updated the examples note.
Upstream-commit: 9043e4c75728059e63b7ab76701a838d6da06494
Component: engine
2013-04-09 10:36:44 -07:00
0327a0e1c1 Merge remote-tracking branch 'origin/fix_flush_behaviour'
Upstream-commit: 2e9a73c5d851ec3893c1013721bdaf3362c92dfc
Component: engine
2013-04-09 10:31:56 -07:00
34cecb4070 Flush stdout on import to avoid deadklock when waiting for stdin (import -). Fixed #365
Upstream-commit: 1eaaa6b744b8017e7d31bdf9dc7095663b4c930c
Component: engine
2013-04-09 10:02:57 -07:00
00965e0e9e Flush whether or not there we set the rawmode to avoid the client to lock
Upstream-commit: cb54e9c659c681fde5311aacefe0e5ea8c564e17
Component: engine
2013-04-09 09:59:30 -07:00
fb9222b734 Add inconditionnal lock in Start/Stop/Kill to avoid races
Upstream-commit: 7c2b085d1a1394dc88b0cdf5c9df02ee1c1b2229
Component: engine
2013-04-09 09:09:54 -07:00
555829afe7 Update the unit test to reflect the new CmdRun behaviour in tty mode
Upstream-commit: d063d52cce9892c777722b30923d9fb1f1385fe8
Component: engine
2013-04-09 08:18:36 -07:00