Commit Graph

162 Commits

Author SHA1 Message Date
bd1dc2a768 white space
Upstream-commit: e8d48641de6c5e866dc18708e2e260b7578c1d50
Component: engine
2013-02-20 12:23:47 +00:00
c032cffa1c make sure the standard "replace input carriage returns with line feeds" and "replace output line feeds with carriage return and line feed" flags are set, even on raw (I dont think it should actually be raw)
Upstream-commit: 3a59336f82e73150059c93398f283b8e15fdb4e9
Component: engine
2013-02-20 12:19:22 +00:00
3f76aea160 Merge pull request #15 from brianm/ignore-produced-binaries
ignore produced binaries
Upstream-commit: 302567df1da9bc9352d7518bac30c1c9525d8ff4
Component: engine
2013-02-19 22:58:24 -08:00
34ee283037 Merge pull request #16 from brianm/master
Add notice about kr/pty in NOTICE
Upstream-commit: a30e9f51a4fb6eb96f4cd97e9a4e24a3495806e0
Component: engine
2013-02-19 22:58:01 -08:00
4d6e95fe39 add reference to https://github.com/kr/pty in NOTICE
Upstream-commit: f0183fa0690caf804301b8acbd0ac527a33d1cbd
Component: engine
2013-02-19 20:55:26 -07:00
cb554356a9 ignore produced binaries
Upstream-commit: 7e5dfc51ade66d75c1429a05334b500d1cb8db20
Component: engine
2013-02-19 20:49:06 -07:00
9f0b4cff0d docker/server: no more dependency on log
Upstream-commit: 004272e6f54c16e16f71ceddff44ae4d423da7c0
Component: engine
2013-02-19 13:07:25 -08:00
e46ebc5e55 dockerd: removed debug messages
Upstream-commit: dd9bb4e0d388788781af0c36dfca0d3792f07d6c
Component: engine
2013-02-19 13:04:19 -08:00
331c7cd0d3 dockerd: create /var/lib/docker if it doesn't exist
Upstream-commit: 5e2f0639c64dc8a7ee5da81e0801bc4a17787407
Component: engine
2013-02-19 13:03:58 -08:00
84de8756d6 Docker is now licensed under the Apache 2.0 license
Upstream-commit: a7e9582a53663453d0885b1a0217941ad1fe595f
Component: engine
2013-02-18 09:56:20 -08:00
bf8488f9ea vagrant: Changed the test image path
Upstream-commit: c696eb8d125528207522d1bbd06082aae9a8d494
Component: engine
2013-02-15 12:19:50 -08:00
81fe2865f4 When the unit testing is not there, issue an error and offer a solution instead of automagically downloading the image
Upstream-commit: 994ec4c8c399538102d47850fc50c7a481d49595
Component: engine
2013-02-15 12:18:36 -08:00
c795ddcc76 run as user tests: Check the exit codes
Upstream-commit: ac36c986e008e8e4e4f56fe510ba7ab0dab0c778
Component: engine
2013-02-15 12:17:58 -08:00
e63a26936b Merge branch 'master' of github.com:dotcloud/docker
Upstream-commit: 9155d1dd6d452755e07330a04fb3bc7c7af6671d
Component: engine
2013-02-15 10:55:55 -08:00
486ef707bc Autonomous testing: Don't depend on /var/lib/docker/images/ubuntu being
there. Instead, automatically downlaod the test image if not present.
Upstream-commit: dd84ba348532b5c50a6c46573803952ac662bc67
Component: engine
2013-02-14 15:37:45 -08:00
92f2fe8ab7 'docker start' and 'docker restart': start or restart a container
Upstream-commit: d2885910bda77538eb31b86b10a3dd85ee2abadf
Component: engine
2013-02-14 13:49:05 -08:00
966f1c8314 Fixed a bug preventing proper reattachment to stdin upon container restart
Upstream-commit: 0da9ccc18e9c30347f394e4cc1231b4b6edca69e
Component: engine
2013-02-13 19:05:57 -08:00
bdbd84a25c Added a restart test to ensure a container can be successfully run twice
Upstream-commit: f2c2d953a871e847cc49b16573f4b1cdc483c4ab
Component: engine
2013-02-13 18:17:42 -08:00
e710d4bb19 Generate LXC config upon start rather than at container creation
Upstream-commit: 1793538a68c8fc2c7c85848d375f12f94c9012e5
Component: engine
2013-02-13 18:14:46 -08:00
d580173852 Server: Restored -u option (from merge)
Upstream-commit: e871eadab16563b4e64ef229c5aeb3cff5b37026
Component: engine
2013-02-13 17:41:50 -08:00
01e4adc046 go fmt
Upstream-commit: 51c11868b0374d2551023ed38a2e929e2ae2717a
Component: engine
2013-02-13 17:40:57 -08:00
cc26343144 Restored dockerd from merge
Upstream-commit: 24ee1524815140b2299a1d98d4690d903a4abeb7
Component: engine
2013-02-13 17:40:10 -08:00
379acaad60 go fmt
Upstream-commit: 2f84bab8797329955e42c3089388c540d8009f04
Component: engine
2013-02-13 17:28:13 -08:00
eacfe8775a merge
Upstream-commit: cb6014d6fdfc0770523ea05ee257f00c3758874a
Component: engine
2013-02-13 17:26:25 -08:00
aaedaa2b20 Implemented support to run as a different user (through the -u flag)
Upstream-commit: 6de3e8a22dfa736f88c0477392474d73f7bed3c5
Component: engine
2013-02-13 17:24:35 -08:00
e924ec5591 Moved server and client logic into sub-packages docker/server and docker/client, respectively. The UI is not affected.
Upstream-commit: e1b25e9b084a2375640b811a27b75b89d57666d9
Component: engine
2013-02-13 17:10:00 -08:00
f86f39ff84 .gitignore
Upstream-commit: ffc8d1e7b97bd9fce380f310e18dcd1402c7c9ac
Component: engine
2013-02-13 16:38:50 -08:00
3b7709c154 More README tweaking
Upstream-commit: 23e55d27555c07584fcd737d3f9a7fbb8c71eabf
Component: engine
2013-02-13 15:10:39 -08:00
25a4efb6b5 Fine-tuning the README
Upstream-commit: 0ea4f3cc765077559cd42f38dc24e71dfb330c29
Component: engine
2013-02-13 15:07:15 -08:00
04bbab3ac2 Merge
Upstream-commit: 2d5a1abf79e219547ef9caf502fdb6b86f93046c
Component: engine
2013-02-13 14:59:24 -08:00
52ebb03e0b Beefed up the README with down-to-earth material. Features, use cases, under the hood.
Upstream-commit: 5e2cec7b4de5b797e3af3a981a4c40c92c1aeb09
Component: engine
2013-02-13 14:58:32 -08:00
3f005f3a30 merge
Upstream-commit: ec21a2d364573fd65086e607d23178e7d6091a9b
Component: engine
2013-02-13 14:19:35 -08:00
22a81ca759 Implemented a self-injecting process wrapper that runs inside the container
- Before starting the container, docker injects itself inside the container by mount binding the dockerd binary into /sbin/init
- Instead of running the user process directly inside the container, we run /sbin/init targetprocess [args...]
- When docker is run as /sbin/init (e.g. argv[0] == "/sbin/init"), then its own sys init code kicks in
- The sys init code will be responsible for setting up the process environment prior to its execution (setuid, networking, ...).
- Finally, docker's sys init will exec() the container's process, thus replacing itself with the target binary (which will be running as pid 1)
Upstream-commit: 58a22942602f9035a1ed44c65ae2c501420600a3
Component: engine
2013-02-13 14:01:44 -08:00
bef500257a go fmt
Upstream-commit: 0d4600626919ec072289c003051f6323db3ffb5f
Component: engine
2013-02-13 14:00:36 -08:00
6d5ac81c48 utils: Added SelfPath(), which figures out the current (absolute) path of the running binary
Upstream-commit: e6adfa2bc68db8f1f1ccd9facea6fa8f8bed4a33
Component: engine
2013-02-13 13:58:28 -08:00
f69baca3fc LXC template: Cleanup using text/template variables
Upstream-commit: 2416edd4002f9c142c19126b93f89e45aabf8d63
Component: engine
2013-02-13 13:56:19 -08:00
8bfbfa7310 'docker pull' will download images from a public mirror by default
Upstream-commit: 3cfac8f335df1902ecdc58d78041ec632b8701fb
Component: engine
2013-02-12 22:24:55 -08:00
47b5079cb2 'docker -i' can be used as an interpreter for scripts (#!/usr/bin/env docker -i)
Upstream-commit: 45c30b8eda828a65f509e774e93d54ec1af969a7
Component: engine
2013-02-12 22:24:15 -08:00
026bf169c9 Upload or download gzipped and bzipped images with put/pull -j/-b
Upstream-commit: 059837c92a6692feb5a6aad879e01e6380f82dca
Component: engine
2013-02-12 22:23:14 -08:00
e6faaa4b36 Clean up list of available commands
Upstream-commit: f20deac47f35520ace5ad1c1aadbd3f8c34ad571
Component: engine
2013-02-12 17:25:41 -08:00
2f7804f789 Make the web UI only accessible on localhost (recommended access is through ssh tunnel)
Upstream-commit: a6b7254a4e362fc6cc28088ba03f3d6cf497b9d5
Component: engine
2013-02-12 09:12:27 -08:00
4748d6a7b6 Fixed a bug which caused dockerd to crash when it received a call without arguments
Upstream-commit: 178e126a07d275105c5cf433bab165cdd8c66cff
Component: engine
2013-02-12 09:10:47 -08:00
7272cb93ab docker -i: interactive mode
Upstream-commit: d0b6f7ef3bebc4dac8f93b3782f58af2e1a94407
Component: engine
2013-02-12 08:48:30 -08:00
14c6c26526 Added comments to rcli
Upstream-commit: abb7b81b130ce9ddbb93a962b4ed84af6654e226
Component: engine
2013-02-12 08:42:15 -08:00
2d49a43787 Disabled remote access to dockerd. Preferred usage is over ssh.
Upstream-commit: f330c2a2488b6c26973f0b0fb8da5115588b7f72
Component: engine
2013-02-12 08:37:12 -08:00
2383f838a0 'docker kill': kill a running container without losing its filesystem and log state
Upstream-commit: bded592a15403e92feb06dcbbed41eb385cabb84
Component: engine
2013-02-11 11:39:28 -08:00
5a3a4033e0 Cosmetic: renamed the variable for sub-command argument parsing, to avoid confusion between 'flag' and 'flags'
Upstream-commit: 5926cfd0ec244f4d5013326ecfa2b9958ca9db88
Component: engine
2013-02-11 11:17:25 -08:00
6c9d4a2b4e Merge pull request #12 from niallo/master
Easy setup w/ Vagrant & Puppet
Upstream-commit: db6ba2b908ec5d25f381c14b30cc01816be45a7f
Component: engine
2013-02-08 19:22:09 -08:00
62200d164a "docker info": display system-wide information.
Upstream-commit: a608f5e3b8455f21dee94a1e358daed420b5e3b7
Component: engine
2013-02-04 23:37:25 -08:00
c8f28dfa5c Clearer error message in the client when DOCKER env variable is not set
Upstream-commit: edc996860496f63b8e4eb786890e8ba2bab7e875
Component: engine
2013-02-04 23:25:28 -08:00