Commit Graph

280 Commits

Author SHA1 Message Date
f514bb46a5 Initial work on moving aufs to a subpackage
Upstream-commit: 699a1074fb9cdf323044f8c132d7130f6a2945bc
Component: engine
2013-10-31 18:07:54 -07:00
67465c23f0 Fixed problem with variables containing \n.
The /.dockerenv file is now a marshalled json array so that environment
variables with \n and other weird values are supported.
Upstream-commit: 1c3a674444c6a6f08ea5ce3812046a00678e4a29
Component: engine
2013-10-31 01:19:32 +01:00
fe428bd3cd Support copying value from env with -e option.
Upstream-commit: 25c4c87c86aca2f17363dbcd9d7bc47640ff9c23
Component: engine
2013-10-31 01:19:09 +01:00
303967e843 Set environment variables using a file.
Upstream-commit: be7eb4bfcb09e17a2c45179bab268ba15050cb6a
Component: engine
2013-10-31 00:48:12 +01:00
15ee14c05a Hotfix: Migrate public mappings after upgrade
Upstream-commit: 746ba127bfb3556d378ccd8b2c725b490d090334
Component: engine
2013-10-30 08:15:12 -07:00
c452ed1a32 Enable sig-proxy by default in run and attach
Upstream-commit: e0b59ab52b87b8fc15dd5534c3231fdd74843f9f
Component: engine
2013-10-29 11:18:34 -07:00
7ce1e20657 Add -name for docker run
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
576fafed48 Rename all cases of "docker-init" to "dockerinit" for consistency
Upstream-commit: cf86e2bb226c82a991eb392e426e707cf8193c03
Component: engine
2013-10-25 15:13:25 -07:00
cd17fb7c91 Move ListOps to utils submodule
This will be needed for later use in docker-init without a docker
dependency
Upstream-commit: d063c8d941d366e4815b91c4fa4fc91fc1e1eb23
Component: engine
2013-10-25 15:13:24 -07:00
952ac8a789 Add links for container relationships and introspection
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
17d84be4be Merge pull request #2385 from dotcloud/suppress_even_more_warnings_test
Improve tests again, remove warnings and prevent some mount issues
Upstream-commit: ff567f87293bfea3f9750bf2b07d97d7f3d1d85c
Component: engine
2013-10-25 15:04:56 -07:00
281b188b3c fix workdir, hostname tests and a bunch on mount issue
Upstream-commit: a675e249b133fe35eaf02fb0bdb807cfd4efe969
Component: engine
2013-10-24 16:57:35 -07:00
a76023f483 Ignore ErrClosedPipe for stdin in Container.Attach.
But pass `err` in the error channel anyway; don't ignore it anymore.
Upstream-commit: b9eb5e04aeac870a9a45ae8961cfb3578af26787
Component: engine
2013-10-24 15:04:58 -07:00
d8ab9dfa35 fix race condition in docker build with verbose + cleanup hostIntegration debug
Upstream-commit: 10e10c9573a0f20243212192fa782feb35651b18
Component: engine
2013-10-22 15:01:06 -07:00
fbbaaa37c7 Fix attach race condition, improve unit tests, make sure the container is started before unblocking Start
Upstream-commit: 3e014aa6624bdc3411bb6f5bc2c297e45a47ad68
Component: engine
2013-10-18 16:26:16 -07:00
b3613b29c9 Fix issue killing container while sending signal
Fix rebase issue
Update docs
Upstream-commit: 333bc23f21e8423d3085632db99a6d1df227c5f1
Component: engine
2013-10-18 16:19:27 -07:00
02bbabf14d Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint
Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
Upstream-commit: 4918769b1ac2d38f23087b766140e6a7f8979310
Component: engine
2013-10-18 16:16:29 -07:00
ff708a52c9 Merge pull request #2242 from jpetazzo/remove-spurious-errors-and-errclosedpipe
Fix error/debug messages in Container.Attach and recover from ErrClosedPipe
Upstream-commit: 3ba989378692e90d3f06ab087b814fcf1a8eacd9
Component: engine
2013-10-16 17:27:23 -07:00
b5387a5b52 fix panic
Upstream-commit: e40fd1e3e10198b9e2291b3383ed041743a73878
Component: engine
2013-10-16 21:39:03 +00:00
cb827ceba2 Refactor container.Start()
Upstream-commit: ed6ca109bf27fb2f1855332c47b7375fe4eaa8aa
Component: engine
2013-10-16 13:12:56 -07:00
adb94a43dc Add clean if start fail
Upstream-commit: 664acd29718ba367cdbad17ec7ee83d1fe01b7e4
Component: engine
2013-10-16 19:48:24 +00:00
cbeb5bbba7 Fix error/debug messages in Container.Attach and recover from ErrClosedPipe conditions.
Upstream-commit: fc659b68e4cd4f1a07a9fe37be4ebcb8e030a652
Component: engine
2013-10-16 11:35:45 -07:00
b2ba4dc1a1 Initial steps to fix Issue #936
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
2013-10-11 08:04:40 -05:00
4664dde409 Merge pull request #1995 from dotcloud/fix_attach_2
Fix the attach behavior with -i
Upstream-commit: bcce3cbdd1cb4d79272c0cbfa43ef0847be1b9d9
Component: engine
2013-09-30 03:29:19 -07:00
54929011c2 Fix the attach behavior with -i
Upstream-commit: 537149829accde869430924cf988f64cfbd16f99
Component: engine
2013-09-27 11:10:55 -07:00
5ead415a2c Move run -rm to the cli only
Upstream-commit: 723de8768145cb47fdb6af399043f9313ad29cdb
Component: engine
2013-09-26 14:52:37 -07:00
3724fa4a50 Merge pull request #1589 from unclejack/479-add_rm_support_to_docker_run
Add -rm to docker run for removing a container on exit
Upstream-commit: db869ecce57baa71f8b5eccf5fb769c3c6796438
Component: engine
2013-09-27 11:45:32 -07:00
5bcfc0bffe automatically remove container via -rm
add AutoRemove to HostConfig
add -rm flag to docker run
add TestRunAutoRemove to test -rm
docs: add -rm to commandline/command/run
add hostConfig to container monitor
make monitor destroy the container via -rm

This adds support for automatically removing a container after it
exits. The removal of the container is handled on the server side.
Upstream-commit: 22e7e107addc4703ee6ef36981dfafe985be695d
Component: engine
2013-09-27 17:43:12 +03:00
58c06a4f26 Container: Always create a new session for the container
We never want the container to be in the same process group as the
daemon, as then the container will receive signals sent to the
process group of the container.
Upstream-commit: c1c74cb0b1e83c4836b51828888daff181f52742
Component: engine
2013-09-24 14:57:29 +02:00
775cc7de8b Merge pull request #1948 from dotcloud/fix_attach
Fix attach issue
Upstream-commit: 2fafe1efce32c7560151e036c43e0dddb7faaa14
Component: engine
2013-09-23 02:15:51 -07:00
f4fdcdb53f Merge pull request #1934 from dotcloud/host-permissions
Only copy files and change permissions with non bindmount
Upstream-commit: 23cf3c7a3318b893ea1dd50cc9f05d4705bcc6df
Component: engine
2013-09-22 09:40:52 -07:00
94c2057eff Improve detach unit tests
Upstream-commit: e97364ecd73fac7abfbd82cc7e3ebaa6cda3c935
Component: engine
2013-09-20 13:36:19 -07:00
bcb4cc4982 Fix attach issue
Upstream-commit: 2bd089dadb9a66829aa1835ad674d652244c5c97
Component: engine
2013-09-20 11:31:00 -07:00
99d2e0befc Only copy files and change permissions with non bindmount
Upstream-commit: b45e280ee8161b38127b90e718945130bc1e935a
Component: engine
2013-09-19 20:35:05 -07:00
3eaff637a9 Merge pull request #1886 from dotcloud/multi-volumes-from
* Runtime: Allow multiple volumes-from
Upstream-commit: 68074fce68ebd3f0e6e7c648ddf72dcc96960096
Component: engine
2013-09-19 12:01:12 -07:00
6deb994c66 Merge pull request #1849 from dotcloud/better_handle_hostConfig
Improved hostConfig reload
Upstream-commit: 45b50730e39ed5badad0a320e2163924117bdd71
Component: engine
2013-09-16 10:48:53 -07:00
2e27a64777 Allow multiple volumes-from
Upstream-commit: b79bd4e864d53e927a9480374646d5e94d12141c
Component: engine
2013-09-14 20:09:15 +00:00
a0167b5a29 Merge pull request #1846 from dotcloud/fix_return_error
Fix wrong return error
Upstream-commit: b986fd00e074432c2f0d05655b4cf22c8d51b36f
Component: engine
2013-09-13 09:44:38 -07:00
3604478445 Transfer uid and gid to volume. Fixes #1737.
Upstream-commit: 9cfbaecfe5b1ccb1ab21c66400f3a1ba1b33da1e
Component: engine
2013-09-11 03:17:42 +02:00
2ea799480f improved hostConfig reload
Upstream-commit: f482432a76a898e5d0252b6c5878a0e60290d0a4
Component: engine
2013-09-10 22:13:15 +00:00
007dc4770c fix wrong return error
Upstream-commit: 44d0f941f287d5dcf6212216b7c0b72b085bdb1a
Component: engine
2013-09-10 17:16:59 +00:00
62ef8f176e Merge branch '1582_fix_volume_content' of https://github.com/griff/docker into griff-1582_fix_volume_content
Upstream-commit: 27ca0c225aebfe93c4edd2d39d188175f4b2f516
Component: engine
2013-09-10 16:52:46 +00:00
8ec924d460 Merge pull request #1735 from dotcloud/1301-support-domainname
Add domain name support
Upstream-commit: e89396809fc3cc9a52e7787f829a8b96c7cee4a4
Component: engine
2013-09-09 17:21:11 -07:00
8ab45c6770 bind mount /etc/hosts and /etc/hostname
Upstream-commit: 4f2e59f94a771c4b60947726815d065ef0ea253a
Component: engine
2013-09-09 20:29:57 +00:00
b8740215e5 add domainname support
Upstream-commit: 0a436e03b8289510ad191a89fcbd5ec06fb8865d
Component: engine
2013-09-09 20:29:06 +00:00
89239ee795 Merge branch 'better_api_ports' of git://github.com/shin-/docker into shin--better_api_ports
Upstream-commit: 2ea52dddec97c26bfcb1d9837a1dae0a9974e14c
Component: engine
2013-09-04 22:25:01 +02:00
8de9407f39 Copies content from image to volumne if non-empty. Fixes #1582.
Upstream-commit: 7a9c71183212a40fdd10369d009a9f97b56fe359
Component: engine
2013-08-30 22:02:05 +02:00
4fa9c87644 Just fixing gofmt issues in other people's code.
Upstream-commit: 6756e786ac36d4e5cda46541b5d6e0b2913b6997
Component: engine
2013-08-30 22:02:05 +02:00
d89a877aeb add TEST env var during tests and silenced parserun during tests
Upstream-commit: eee6d3dae96afbcb1456b4a84f05f1aac44e5598
Component: engine
2013-08-29 22:55:29 +00:00
828c933a0c More descriptive, easier to process container portmappings information in the API
Upstream-commit: 98018df07856811536722df84b9558e0efdabdca
Component: engine
2013-08-28 00:20:35 +02:00