Eystein Måløy Stenberg
f9b4bbea9e
docker in-container process management with CFEngine
...
Upstream-commit: 937f52aef98ac61bca75ef25c16b79b5fafa58ff
Component: engine
2013-11-25 14:24:23 -08:00
Andy Rothfusz
2f62549ee3
Merge pull request #2849 from jamtur01/supervisor
...
Added a Supervisor process management example
Upstream-commit: aa48acc5ec6621a9fb720fa00772fb8eeaa2be7a
Component: engine
2013-11-25 13:50:44 -08:00
Andy Rothfusz
88286721b0
Merge pull request #2836 from fj/topic/spinx⇒sphinx
...
Corrects misspellings of 'Sphinx'
Upstream-commit: ac70e296dbc55a60bd8d6fce7b1fb4a260a91fb1
Component: engine
2013-11-25 13:40:26 -08:00
Andy Rothfusz
e6304d10dd
Merge pull request #2835 from fj/topic/update-native-installation-instructions
...
Use requirements.txt rather than manual installation for docs
Upstream-commit: e2c3860ec3c69acdda87959927ba3c4fccee4df9
Component: engine
2013-11-25 13:28:18 -08:00
Andy Rothfusz
2a6a9722d8
Merge pull request #2833 from twillouer/patch-1
...
Better copy/paste :)
Upstream-commit: 2d715bf3c0ce37e31553f35fbab2112df482c46d
Component: engine
2013-11-25 13:21:50 -08:00
Victor Vieux
0d748580b7
Merge pull request #2848 from pnasrat/713-data-races
...
Fix data race in TestLogEvent
Upstream-commit: d9e54e28e715cf4f689cf407618edc433494faa3
Component: engine
2013-11-25 12:07:01 -08:00
Paul Nasrat
f0926e8de2
Fix data race in TestLogEvent
...
Found with -race. Improve locking on Server.
Upstream-commit: abfdaca3f86d7951693697fbd849078d6b406478
Component: engine
2013-11-25 14:17:58 -05:00
James Turnbull
8d1f8e4c83
Added a Supervisor process management example
...
Upstream-commit: ba2b36e192c571566fa4769b1031d120c26b8ae0
Component: engine
2013-11-25 14:05:01 -05:00
William Delanoue
a92bcacbc2
Better copy/paste :)
...
Upstream-commit: 0a89db04fe62958283c17baa11893c6ad868bf9d
Component: engine
2013-11-24 13:55:53 +01:00
John Feminella
51f543bb50
Corrects misspellings of 'Sphinx'
...
Upstream-commit: 1cce9f25b2866883b3f1c784ea642df4e69ca6bd
Component: engine
2013-11-23 16:21:27 -05:00
John Feminella
800614c9ba
Suggest users install dependencies by using requirements.txt, not manually
...
Upstream-commit: f1b3e278b964fca4884dca80ffbe79c0e82a85ca
Component: engine
2013-11-23 15:53:50 -05:00
Sven Dowideit
a62fb77dd4
be very explicit about docker insert - it does not insert a file into an IMAGE, it creates a new image that adds only that file to its specified parent
...
Upstream-commit: e288e7763e20d1d8c7b8f5f9fffa00136577ed95
Component: engine
2013-11-23 12:48:34 +10:00
Guillaume J. Charmes
63cc3164f1
Remove useless New*Opt functions, singleline Opt types
...
Upstream-commit: c67f9b671df024d06b0af0a0eaa02058e69ee9f5
Component: engine
2013-11-22 14:42:30 -08:00
Guillaume J. Charmes
ce1c3dbb0a
Make a validation on links name
...
Upstream-commit: 1c8ae47770b423b9c2f1125bd25cef0482a4600d
Component: engine
2013-11-22 14:33:25 -08:00
Guillaume J. Charmes
d6ea186ed7
Remove goroutine leak. Make sure termcap are reset each time.
...
Upstream-commit: d55998be81973be5b083eed56b223c8ce98ce073
Component: engine
2013-11-22 14:09:37 -08:00
Guillaume J. Charmes
6e7d75df95
Format CmdRun
...
Upstream-commit: 076c0eab704e5c4819611a42b1551f1d759fb376
Component: engine
2013-11-22 12:14:34 -08:00
Guillaume J. Charmes
4a4a051d8a
Use a constant for PortSpecTemplate + display the template in the CmdRun help
...
Upstream-commit: 1f9223a7c2c0e5c04936c56a071830f8792c3dd7
Component: engine
2013-11-22 12:00:34 -08:00
Guillaume J. Charmes
c04337f42e
Reformatting parseRun and partParse
...
Upstream-commit: 476559458d49b6d4eacfdbe9025ddf69947ae2b7
Component: engine
2013-11-22 11:58:02 -08:00
Michael Crosby
7c2bc2f42b
Merge pull request #2769 from vbatts/none_bridge
...
Do not setup bridge ip if 'none' bridge is provided
Upstream-commit: d4c8fb9ee27222e4d33b616bd63ea7863e0064ee
Component: engine
2013-11-22 11:48:33 -08:00
Michael Crosby
d8bc0d9deb
Merge pull request #2823 from dotcloud/2817-run_rm-fix
...
Fix docker run -rm
Upstream-commit: ae8c589d35e9cd7148d98a0471d0c5c9c77e3908
Component: engine
2013-11-22 11:35:29 -08:00
Vincent Batts
92b39790ed
fix the nil pointer panic on closing a disabled network manager
...
Issue #2768
Upstream-commit: ef14aaf627377b24edb55fe2080e10f748c0e444
Component: engine
2013-11-22 14:28:49 -05:00
Victor Vieux
f1afbc9e5f
fix -rm
...
Upstream-commit: 1e7c04fcfe0b1dbc93a8d70e7bf94e963aa764d8
Component: engine
2013-11-22 11:23:48 -08:00
Mark Allen
65390c08ce
Pass terminal setting to display utils
...
Upstream-commit: 8b0cd60019b33488f8819da5c7bdd28d1d3fc737
Component: engine
2013-11-22 00:05:55 -06:00
Victor Vieux
3f82c6cf46
Merge pull request #2812 from dotcloud/bump_v0.6.7
...
Bump v0.6.7
Upstream-commit: a93e40a158aad6f7364db5db69298e8ad7c38949
Component: engine
2013-11-21 18:39:15 -08:00
Victor Vieux
89913b0834
Bump version to v0.6.7
...
Upstream-commit: 53f1bf0f995d4c0e6af3eb14cd76a1b049c851a2
Component: engine
2013-11-21 18:03:41 -08:00
Michael Crosby
b82d2b8801
Merge pull request #2798 from dotcloud/fix_state_race
...
Refactor State to be 100% thread safe
Upstream-commit: 25e443a3c7f55d5ccfb1f5a96c427bd50b978f4d
Component: engine
2013-11-21 16:39:50 -08:00
Guillaume J. Charmes
915356af08
Refactor State to be 100% thread safe
...
Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220
Component: engine
2013-11-21 16:34:58 -08:00
Michael Crosby
0e00966e8f
Merge pull request #2678 from cxmcc/minor
...
Minor code simplification for Containers api
Upstream-commit: d6e6214d37499977110e05d5d01cbf25dcae878f
Component: engine
2013-11-21 16:27:15 -08:00
Michael Crosby
8c720af218
Merge pull request #2488 from viirya/fix_container_volumes_delete
...
Skip the volumes mounted when deleting the volumes of container.
Upstream-commit: 70f1bd31041f9207ae06be5fe2680152eb154047
Component: engine
2013-11-21 16:20:22 -08:00
Michael Crosby
b7afbe130d
Merge pull request #2304 from unclejack/fix_layer_size_computation
...
Fix layer size computation: handle hard links correctly
Upstream-commit: f7c2a00557a304af753e487d87ef5ed9b6266e27
Component: engine
2013-11-21 16:10:24 -08:00
Victor Vieux
4718170d22
Merge pull request #2731 from SvenDowideit/docker-commit-doc
...
make the docker commit help more copy&pasteable
Upstream-commit: 8498b44eac24f4f62cd082aa9ecac7ce503bb3ef
Component: engine
2013-11-21 15:33:05 -08:00
Andy Rothfusz
de93f1b190
Merge pull request #2772 from bitoiu/patch-3
...
Change to documentation for AWS AMI request
Upstream-commit: e2dcfc2cf7ea00619e327a900d1b87cb437a634c
Component: engine
2013-11-21 15:15:04 -08:00
Andy Rothfusz
1eafcb9d5e
Merge pull request #2717 from metalivedev/2342-uploadingcontext
...
Fix #2342 . Harmonize information about ADD. Cross-link build info.
Upstream-commit: 9b4c15114201bab21437853463d58652c8e1624a
Component: engine
2013-11-21 15:09:47 -08:00
Andy Rothfusz
96fa8485ac
Merge pull request #2799 from rosenhouse/patch-1
...
Fix title on doc page for remote_api_client_libraries.rst
Upstream-commit: 50239e057309f4efdb6f9ed39d988a8316601103
Component: engine
2013-11-21 14:40:33 -08:00
Guillaume J. Charmes
e859413830
Merge pull request #2763 from dotcloud/use_full_id_delete
...
Do ont truncate ID on docker rmi
Upstream-commit: 42c23b0f048b417bd233bef3f57e529102ae1177
Component: engine
2013-11-21 14:39:38 -08:00
Paul Morie
f8ba7a65e3
Fix typo in pullImage
...
Upstream-commit: 3f17844b6ec3edb981653ca237d085909d5be671
Component: engine
2013-11-21 17:29:03 -05:00
Guillaume J. Charmes
68f143de04
Merge pull request #2794 from dotcloud/fix_status_code_and_usage
...
fix status code and usage
Upstream-commit: bcdeb37bb64eca25bee9b1736a53f8ef4684c9a0
Component: engine
2013-11-21 13:48:38 -08:00
Gabe Rosenhouse
63c337d326
Fix title on doc page for remote_api_client_libraries.rst
...
Upstream-commit: 362e9d6b3c7049d44c016ee72fe255b76ec80c5a
Component: engine
2013-11-21 12:45:01 -08:00
Michael Crosby
9dfa0ceb9c
Revert "Lock state before we modify."
...
This reverts commit d7e2fc898284fe29ed43f7b28eae56e7e052e854.
Upstream-commit: cb70eedfdad40538983f9610322262ce84e284a0
Component: engine
2013-11-21 12:11:25 -08:00
Victor Vieux
06096928cc
Return status exit status 2 on usage, move parserun into commands.go, display usage on stderr
...
Upstream-commit: 75a7f4d90cde0295bcfb7213004abce8d4779b75
Component: engine
2013-11-21 11:43:07 -08:00
Victor Vieux
ef47b4e273
Merge pull request #2795 from pnasrat/docker-testmultipleattachrestart-race
...
Lock state before we modify.
Upstream-commit: eaeb969138205349c08e485c0bc4d29dbe2567d7
Component: engine
2013-11-21 11:28:02 -08:00
Paul Nasrat
7a482f2a8c
Lock state before we modify.
...
When we start a container we lock state, we should do the same in stop.
Detected via -race.
Upstream-commit: d7e2fc898284fe29ed43f7b28eae56e7e052e854
Component: engine
2013-11-21 08:06:02 -05:00
Victor Vieux
3152efa2ba
Merge pull request #2793 from crosbymichael/offline-ids
...
Allow images to be saved and loaded by id and repository
Upstream-commit: f20c738963cb54884037e54a62743398eebfc0c2
Component: engine
2013-11-21 02:44:00 -08:00
Michael Crosby
10c7f84432
Allow images to be saved and loaded by id and repository
...
Upstream-commit: fd7ab143bf1ecfbf20df90edd876f73dc28c264d
Component: engine
2013-11-20 17:28:19 -08:00
Andy Rothfusz
94ec1bcdfe
Merge pull request #2727 from SvenDowideit/docker-images-doc
...
add some common examples for docker images, and tell the user what -a filters out
Upstream-commit: 82cdd21a3492789a47fc4c3bb3f8a4d85b89d14c
Component: engine
2013-11-20 16:30:48 -08:00
Michael Crosby
afc3ae3564
Merge pull request #2723 from SvenDowideit/doc-build-image
...
Use the work Path for docker cp CONTAINER:PATH
Upstream-commit: 2bc35287a080cd9a9805e343595055dcbfb0db01
Component: engine
2013-11-20 11:10:13 -08:00
Guillaume J. Charmes
c17e4279fa
Merge pull request #2773 from dotcloud/speed_up_docker_ps
...
speedup docker ps
Upstream-commit: b4f7078a021489395bae4e43a33d457719d30ccc
Component: engine
2013-11-20 10:40:03 -08:00
Guillaume J. Charmes
88d0c27664
Merge pull request #2760 from dotcloud/improve_engine_test
...
improve tests on the engine
Upstream-commit: 9e68913397f6fa6aa495480d72b56b5e071ef40b
Component: engine
2013-11-20 10:38:46 -08:00
Victor Vieux
eeb01414c6
Merge pull request #2747 from jpoimboe/test-fixes
...
Test fixes
Upstream-commit: 304a80fcd5ed6d3a73db6b7e73ab5e5ac5e9462d
Component: engine
2013-11-20 10:07:40 -08:00
Josh Poimboeuf
5763c9619e
resize pty after starting
...
Since ptyMaster is created during container start (startPty), it should
resized after starting, not before.
Upstream-commit: 171d681724443cf69f669dcaf4887f5d99894b25
Component: engine
2013-11-20 11:40:30 -06:00
