5936316577
Merge remote-tracking branch 'origin/disable_signals-create_escape_sequence'
...
Upstream-commit: 1b7115a33772806b36006f66b4425149f2fb3123
Component: engine
2013-04-09 12:56:32 -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
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
fb9222b734
Add inconditionnal lock in Start/Stop/Kill to avoid races
...
Upstream-commit: 7c2b085d1a1394dc88b0cdf5c9df02ee1c1b2229
Component: engine
2013-04-09 09:09:54 -07:00
e37ef931cd
Change the behaviour of CmdRun in tty mode: dont kill the process uppon detach
...
Upstream-commit: 64c1b6d9cd16b7d4cc8ebda2de82bc76e0c99f43
Component: engine
2013-04-09 08:18:16 -07:00
b8a98bd6d9
Remove the mutexes and use chan instead in order to handle the wait lock
...
Upstream-commit: 329f4449dc0f5722150a8160262b817e12be20fc
Component: engine
2013-04-09 07:57:59 -07:00
91c3817cdd
Fix run disconnect behavious in tty mode + add unit test to enforce it
...
Upstream-commit: 99b5bec0692ea9ec8a397926df9dd545fb264ac9
Component: engine
2013-04-05 19:02:35 -07:00
561e5a7afb
Cleanup pty variable names
...
Upstream-commit: 7d8895545e2442ea095f83c90edff64835a0d0b5
Component: engine
2013-04-05 17:40:55 -07:00
8f7ae9e955
Make sure the process start in his own session and grabs the terminal
...
Upstream-commit: 33a5fe3bd4cb0bd31b01da89c8c4c3321701e7a1
Component: engine
2013-04-05 17:40:55 -07:00
0d916a930b
Merge the 3 ptys in 1
...
Upstream-commit: 847a8f45a45dccd0574396b888670004e32762e6
Component: engine
2013-04-05 17:40:55 -07:00
3bb1012d01
Merge remote-tracking branch 'origin/219-default-bridge-2'
...
Upstream-commit: 793c1ad9909701a8b89ac6731ac266048e48ec46
Component: engine
2013-04-05 14:02:16 -07:00
e9f0c90d6d
Choose which TCP frontend port to allocate with '-p :PORT'
...
Upstream-commit: 2aad4a34785a1b0d02d910a14dbb9b0d6d3edc17
Component: engine
2013-04-04 22:58:01 -07:00
8bbb6b65f9
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 3de51b7bfe27bd744470ee1e80dec8eb0c49f6de
Component: engine
2013-04-04 17:00:59 -07:00
1b644b6e4b
Merge pull request #322 from sa2ajj/port-map-nitpick
...
change option description to reflect the semantics
Upstream-commit: a58cd8c616dc4e761a722246cf69a3feab428953
Component: engine
2013-04-04 16:39:54 -07:00
b7d6bc48b8
Merge remote-tracking branch 'dominikh/minor-code-touchups'
...
Upstream-commit: 586a79cca0c0b7f432e31807e3b8ca79d565c27e
Component: engine
2013-04-04 16:20:37 -07:00
bbe5556b93
Merge remote-tracking branch 'dominikh/improve-attachopts'
...
Upstream-commit: 26088a72b34a0b2e17701f664e38a7d0a6ecd1b8
Component: engine
2013-04-04 15:18:41 -07:00
04e71efb01
Make LXC aware of custom bridge
...
Upstream-commit: d9a9bfc9c7bee2e4316debcd9f393b8f2fb1e45a
Component: engine
2013-04-03 16:15:44 -07:00
da9369bbbf
clean up AttachOpts type
...
Primarily, there is no reason to have a pointer to a map. Furthermore,
make() can be used on AttachOpts directly.
Upstream-commit: 4f36039e7b5c7054fdbf3eb328c242e7acb6d7f8
Component: engine
2013-04-03 16:06:35 +02:00
4e81438347
change option description to reflect the semantics
...
At least, for me, 'map' means that there are two values and one is "mapped" to
another.
In this case, just one value is provided (container's port), the other value is
automatically obtained (host's port) and the actual mapping can be seen using
``docker port`` command.
Upstream-commit: b74d1c92479bc6df61e7283f7639b02837bfb5f3
Component: engine
2013-04-03 16:37:56 +03:00
d6aac87dba
replace unreachable returns with panics
...
Not only is this a more common idiom, it'll make finding bugs easier,
and it'll make porting to Go 1.1 easier.
Go 1.1 will not require the final return or panic because it has a
notion of terminating statements.
Upstream-commit: 22f1cc955dbf25132e69d126f8db0e5498bffbd2
Component: engine
2013-04-03 11:18:23 +02:00
36ddc7dcc6
Merged attachStdin
...
Upstream-commit: 15c3096e8942ac31eb5611b41d08fcc31061be65
Component: engine
2013-04-02 20:46:32 -07:00
23aad300e5
Merge remote-tracking branch 'robryk/writebroadcaster-stuff'
...
Upstream-commit: 22d16229264aeb176acc40db2158d9b944cb3ef1
Component: engine
2013-04-02 20:35:13 -07:00
7777dd857e
docker run [-a [stdin|stdout|stderr] [...]]: choose which streams to attach to when running a command. Fixes #234 .
...
Upstream-commit: c04af2a330991fcd52bcce213bcb863cff95d378
Component: engine
2013-04-02 18:07:16 -07:00
9ff05ec38f
Close the broadcaster once they are not needed anymore
...
Upstream-commit: ad2bbe23be869e3a3287cedbf0408115e97a4a49
Component: engine
2013-04-02 12:19:01 -07:00
20aa05fbaa
Add a stdincloser to container.Attach in order to close the client connection when needed
...
Upstream-commit: 6882c78ce447b468262b53aef2ac0577151ea98c
Component: engine
2013-04-02 12:18:20 -07:00
cd9062641b
Activate Config.StdinOnce at argument parsing
...
Upstream-commit: aea2675f7b2e4aa8bf63c8472af40bc059bd5d14
Component: engine
2013-04-02 11:02:19 -07:00
450827385c
Renamed writeBroadcaster.Close() to CloseWriters().
...
Upstream-commit: a83d87abd442dda5f2d67a2701aae9c7b891e68a
Component: engine
2013-04-02 10:45:17 +02:00
f7fc21bc5d
Refactored CmdRun and CmdAttach to use Container.Attach
...
Upstream-commit: c808940c041ca8c7f9f9c5e0fa93e37ebfdd412a
Component: engine
2013-04-01 23:52:20 -07:00
21d5e7b3d6
add host name parameter to "run" command
...
fixes #243
Upstream-commit: f65fc1e766cefed06131acf1ede6bb1f25f75fff
Component: engine
2013-04-02 01:26:17 +03:00
21949938ee
make complex options to stand out
...
Upstream-commit: dcc9dfb27d49c7e7f58e04bf5656656f69e76fe1
Component: engine
2013-04-02 01:26:17 +03:00
2ac307781e
Use a *println or *print function instead of *printf where appropriate.
...
Upstream-commit: c298a91f95dafb056cede9036f5e81f259b8f3e9
Component: engine
2013-04-01 12:17:00 -07:00
28343696b9
Show shorthand image IDs for convenience. Shorthand IDs (or any non-conflicting prefix) can be used to lookup images
...
Upstream-commit: 1632566ecb133fb0853aec6715c5c06a4a9e41da
Component: engine
2013-03-31 22:11:55 -07:00
bd2e319579
Temporarily disable a broken test (waiting for @creack to fix it), and silence a warning which pollutes unit tests but is complicated to fix
...
Upstream-commit: a52a28b60946463e8208b8cd5d737ba79f23a8b8
Component: engine
2013-03-31 22:05:14 -07:00
a591bf3f3d
gofmt
...
Upstream-commit: 54443c092caf9c1e11c47ea30400084d009af6e9
Component: engine
2013-03-31 22:04:59 -07:00
8a40ce58f3
Make IP allocator lazy
...
Instead of allocating all possible IPs in advance, generate them as
needed.
A loop will cycle through all possible IPs in sequential order,
allocating them as needed and marking them as in use. Once the loop
exhausts all IPs, it will wrap back to the beginning. IPs that are
already in use will be skipped. When an IP is released, it will be
cleared and be available for allocation again.
Two decisions went into this design:
1) Minimize memory footprint by only allocating IPs that are actually
in use
2) Minimize reuse of released IP addresses to avoid sending traffic to
the wrong containers
As a side effect, the functions for IP/Mask<->int conversion have been
rewritten to never be able to fail in order to reduce the amount of
error returns.
Fixes gh-231
Upstream-commit: 6f9a67a7c7cb717ad1a575df3e4c0fd2ec8bc651
Component: engine
2013-04-01 06:02:44 +02:00
0d0aacb146
Add a check to avoid double start (resulting in dockerd to panic) and unit test for it
...
Upstream-commit: d949e2804a35497bc041537734dfeff150ea7e21
Component: engine
2013-03-31 14:15:10 -07:00
6d568468b4
Show shorthand container IDs for convenience. Shorthand IDs (or any non-conflicting prefix) can be used to lookup containers
...
Upstream-commit: 0b9a3c86a26b4b7eb463a6c73cb030bc851fdd64
Component: engine
2013-03-31 02:02:01 -07:00
10d17433d1
Close the containers stdin when the process dies
...
Upstream-commit: 47607494027be3d37cbb01a07e026e99f9c5151b
Component: engine
2013-03-30 09:08:53 -07:00
4a407f8199
Fix a scope issue preventing the close of slave stdin pty ( #228 )
...
Upstream-commit: 7efde5eb8350ad709608e619b01af4108cc9d567
Component: engine
2013-03-30 09:07:54 -07:00
8e072eedc0
Store the master ptys in order to close them when the process dies ( #228 )
...
Upstream-commit: 5252ab697c927d7b51109a1bb1a68d6a3dfc88b3
Component: engine
2013-03-30 09:05:53 -07:00
3f6c2c9af6
Merge pull request #265 from dotcloud/formating_debug_harmonize
...
Formating debug harmonize
Upstream-commit: d0d5d5ff094a5c03a6b13a18394108cda126eef2
Component: engine
2013-03-29 21:30:43 -07:00
0ccd58f712
Do not log non-running containers
...
Upstream-commit: 0f7a4534c16cda07344a7231d6012268f4aa53aa
Component: engine
2013-03-29 08:46:06 -07:00
38f2e38ea3
Remove unused variable from container struct
...
Upstream-commit: 7a565a0479b6a797a0cdc9a4156e57ce811032b3
Component: engine
2013-03-29 08:41:48 -07:00
a659bdb4eb
Add some error checking in container monitor
...
Upstream-commit: 69c2250ec2fd23dc9d31372cb433b7c18a917d09
Component: engine
2013-03-29 08:29:59 -07:00
2588801f2a
Harmonize the error management. Use fmt.Errorf instead of errors.New
...
Upstream-commit: d17f78c373d5d8cd015626c7972e0e2365eab2a7
Component: engine
2013-03-29 08:19:42 -07:00
f235c36167
Add debug infos
...
Upstream-commit: ccac5b138253ab87846089cb5af9b4b77a7fd9d5
Component: engine
2013-03-29 08:18:43 -07:00
2c32113c8a
Remove unnecessary part of paths to lxc executables
...
Upstream-commit: 6d72758f1268f710be635cb16ef8e001fc6516a5
Component: engine
2013-03-29 12:07:25 +07:00
3e91a54abc
Camelize some snake_case variable names
...
Upstream-commit: a6da7f138c0b260d560c63e234c87db0f5c72bb1
Component: engine
2013-03-28 20:12:23 -04:00
