225e97e755
Merge pull request #3724 from creack/extract-lxc-phase-2
...
Refactor process to command
Upstream-commit: 0dd856ee7f636c82e9420ebbd9e2d0b3aeea5136
Component: engine
2014-01-23 15:28:45 -08:00
68cb16c9bc
Merge pull request #3743 from pmorie/typo
...
Fix typo in comment in container.go
Upstream-commit: f948820d0394b75f79522d843e89011a38f48384
Component: engine
2014-01-23 15:15:18 -08:00
f0687486f0
Fix typo in container.go
...
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com > (github: pmorie)
Upstream-commit: 2f57eb04102c2ef08e478d3977fc3682672473af
Component: engine
2014-01-23 18:10:33 -05:00
3210d89241
no more TODO
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5d71ad8b192e4e4b41c58ff3eae10c0d8ccdec71
Component: engine
2014-01-23 12:55:58 -08:00
f68d62aa35
Fix mflag test issue with "ResetForTesting" (which only showed up under dyntest for some odd reason)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: f60eee4894cfa07e8a969425c72d291f80f3053a
Component: engine
2014-01-23 13:03:17 -07:00
49d42f507d
update REMOTE_TODO.md
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 4d4339c6deb44eb5aee7578a0efd185f349ef68e
Component: engine
2014-01-23 10:50:11 -08:00
f341e16451
Merge pull request #3720 from therealprologic/master
...
Add script for building CRUX base images
Upstream-commit: 210db8e846cde8a56a5bcd6a3c5016017ecc86cd
Component: engine
2014-01-22 21:28:51 -08:00
0906bdb125
Added script for building Base Docker CRUX images
...
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au > (github: therealprologic)
Upstream-commit: d247b7d42613e3435e332aa05351d22e1fbea82c
Component: engine
2014-01-23 13:53:19 +10:00
96dad4beb8
Populate command in ghost state to pass to RestoreCommand
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8723a8a89ec7d5b2a37e0536d7aadd78e5329773
Component: engine
2014-01-22 14:05:01 -08:00
b038ed039d
Compile driver interface changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ba8ca598625215499713a9b65001164b672e69ab
Component: engine
2014-01-22 14:05:01 -08:00
3467e8dad5
Populate Command self cointainer (toward Restore())
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 75e0357d691499b20dc903b702bc44c444f85005
Component: engine
2014-01-22 14:04:55 -08:00
a01f048b9e
Merge pull request #3716 from johngmyers/patch-1
...
Grammar fixes and wording improvements
Upstream-commit: 700db10c850f4721ab890c1d4f0fa22a2fbaa29d
Component: engine
2014-01-22 12:01:13 -08:00
b2fe863a63
Merge pull request #3713 from SvenDowideit/document-bind-mount-file
...
bind mounts work for files - give an example, as its very very useful.
Upstream-commit: 9a2e673f4f5999c5b3a282c7f6ffe87793dfd5e5
Component: engine
2014-01-22 11:54:41 -08:00
31fb352a08
Merge pull request #3558 from tianon/buildfile-run-json
...
Add support for RUN [""] in Dockerfiles
Upstream-commit: 2a6e93a6fb9870cd2c2e1942afcdea5f154f1715
Component: engine
2014-01-22 11:51:34 -08:00
47913f96e1
Merge pull request #3073 from alexlarsson/refcount-driver-mounts
...
Refcount driver mounts
Upstream-commit: f61a91f50a753e0b8878675b4bab8ee4dc2a70e1
Component: engine
2014-01-22 11:42:17 -08:00
f98385a1b6
Merge pull request #3712 from plietar/kill-signal
...
Add a -s option to the kill command to specify a signal.
Upstream-commit: 44a0bab30488f2d6084feaf34389ac305b53ae8d
Component: engine
2014-01-22 11:38:16 -08:00
78636fd4dc
Merge pull request #3682 from alexlarsson/implement-tar
...
Implement tar in Go
Upstream-commit: 639d2ecd4f7a86a34bdde890002129f0b22c85fa
Component: engine
2014-01-22 11:23:47 -08:00
dcd6de3524
Merge pull request #3695 from chazomaticus/3628-ignore-kernel-flavor
...
ignore non-numeric characters when parsing kernel version
Upstream-commit: 4ccf423f4208df49cde288f9f76cf1319cabc321
Component: engine
2014-01-22 11:19:05 -08:00
c462b24e66
Add comment about ignoring Sscanf error
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
Upstream-commit: dea3c2655dc02c03cf7dc03d058068cf9f0d0970
Component: engine
2014-01-22 09:32:50 -08:00
9cba35e523
change the documentation only - It looks like we have a number of cmdline params to completely update from the code version
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 0f5ad430c4a37f6efe7f27428ba54cf719936b68
Component: engine
2014-01-22 21:29:05 +10:00
3f862551be
Wording improvements
...
Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com > (github: johngmyers)
Upstream-commit: 1c06a9196451a595c71a47ba9fb4e9f4bc270746
Component: engine
2014-01-21 22:40:33 -08:00
d09055ce5a
Grammar and punctuation fixes
...
Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com > (github: johngmyers)
Upstream-commit: f3cb808e9d7d870dc71510bdeecec15745bb44b5
Component: engine
2014-01-21 22:40:06 -08:00
04f201ccfb
Add a --signal option to the kill command to specify a signal.
...
Docker-DCO-1.1-Signed-off-by: Paul Lietar <paul@lietar.net > (github: plietar)
Upstream-commit: 1f75a0bf435fe9a0f118b027e0387ba41e201c66
Component: engine
2014-01-22 06:10:52 +00:00
5ac1ad822b
Merge pull request #3708 from creack/fix_run_exit_code
...
Fix issue with exit code in non-tty mode.
Upstream-commit: 3cb5bc5ae524531e0285661aec5f1542d6d09d51
Component: engine
2014-01-21 18:15:01 -08:00
7ac8aea1b9
Fix issue with exit code in non-tty mode.
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: fd38de2818d959a9f5591537515e923a3ac56632
Component: engine
2014-01-21 18:05:03 -08:00
354af1c70c
Merge branch 'add_missing_attributes' of https://github.com/rogaha/docker into rogaha-add_missing_attributes
...
Conflicts:
api.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 4c1879f919689cd884848f3c2269df942a5788cf
Component: engine
2014-01-21 18:01:19 -08:00
df0756600a
Merge pull request #3707 from bkcsoft/fix-bash-hashbangs
...
Update bash shebangs to use "/usr/bin/env bash" for increased portability
Upstream-commit: 572002a71593009bd4dd3285ac429b70042b6ce6
Component: engine
2014-01-21 17:30:52 -08:00
923913cbf1
This should make all bash-scripts run on pretty much any posix-system (with bash installed ofc...)
...
Docker-DCO-1.1-Signed-off-by: Kim BKC Carlbacker <kim.carlbacker@gmail.com > (github: bkcsoft)
Upstream-commit: b1953baba28362c928d962f0729325d3293c4753
Component: engine
2014-01-22 02:21:56 +01:00
fe22aca6b8
Merge pull request #3705 from crosbymichael/fix-die-event
...
Fix die command when monitor returns
Upstream-commit: cb33f739a19ca4382499aaa9f50bd4a031ba0cbe
Component: engine
2014-01-21 17:13:29 -08:00
5bf17309b9
Merge pull request #3706 from creack/fix_wait_stopped
...
Fix wait on stopped container (after docker restart) + add Unit test for that case
Upstream-commit: 0b789ca84480731ae275569282a8be2e68616196
Component: engine
2014-01-21 17:03:35 -08:00
f30d57c548
Fix wait on stopped container (after docker restart) + add Unit test for that case
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 0376a69cb1cc839f7e1a147623b399147a5976c9
Component: engine
2014-01-21 16:49:24 -08:00
003b985961
Fix die command when monitor returns
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 80f128a6ea2b71e2ed6838c6a913086859ed50ff
Component: engine
2014-01-21 16:18:57 -08:00
054751d110
Documentation about automatic bind-mount dir creation
...
Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com > (github: mpetazzoni)
Upstream-commit: 47d1413d7a0850edc64c62f1473b4c4a3f417d7c
Component: engine
2014-01-21 16:05:30 -08:00
dd5574687b
Automatically create non-existent bind-mounted directories on the host
...
Fixes #1279 .
Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com > (github: mpetazzoni)
Upstream-commit: 3e96f46b30340f8468a7bac8c159b610a2309821
Component: engine
2014-01-21 16:05:29 -08:00
45b4cb5fbb
Merge pull request #3704 from vieux/json_api_return_valid
...
Switch back to the valid json format
Upstream-commit: b417f79c0032e8453df92656589e21f445d73043
Component: engine
2014-01-21 15:35:06 -08:00
b2b5a8cb20
Merge pull request #3640 from proppy/networkgetroutes-add-default
...
netlink: add default Route to NetworkGetRoutes
Upstream-commit: be6aeda1e497fd06da410ba9d5459efdd7c19885
Component: engine
2014-01-21 15:20:16 -08:00
2a860faf85
switch back to the valid json format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e3461bc8d694fa4b104a9cdd08e11de26a04d923
Component: engine
2014-01-21 15:06:23 -08:00
a633d7a05c
Merge pull request #3688 from shykes/docs-simplify-basic-usage
...
Simplify basic usage docs
Upstream-commit: 62c456398767b3e8155ec6d0df265cb5fb464438
Component: engine
2014-01-21 11:41:32 -08:00
0c36be10c2
Merge pull request #3566 from tianon/fix-volume-symlinks
...
Fix symlink mounting issues
Upstream-commit: e56562c35e0ef39a02c171f60fccd6588edb8846
Component: engine
2014-01-21 11:37:05 -08:00
3324f8180d
Merge pull request #3686 from vieux/load_job
...
Load job
Upstream-commit: 9164ba6516d3f91c397e90ee02af4afa17ca20fc
Component: engine
2014-01-21 11:29:15 -08:00
d782b526fa
move load to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: f2f44b91a8ebbcea9c62f0c1b63e5aabaa3110b4
Component: engine
2014-01-21 11:28:45 -08:00
1b8b44e502
Merge pull request #3690 from shykes/cleanup-maintainers
...
Cleanup maintainers
Upstream-commit: ba4ae40445d40545a83b5dc9040c1c4942bb51ce
Component: engine
2014-01-21 11:18:23 -08:00
7428886159
Merge pull request #3698 from alexlarsson/fix-shared-root
...
Fix handling of shared roots
Upstream-commit: f98a596be9eda121c6a9d5eef53d3d38849d9b56
Component: engine
2014-01-21 11:09:36 -08:00
8a428ead43
Merge pull request #3687 from shykes/docs-intro
...
docs: harmonize intro paragraph with website
Upstream-commit: fb919137bec47bb4922a2571a0f9410a5887c670
Component: engine
2014-01-21 11:02:55 -08:00
08877d190e
Merge pull request #3700 from jamtur01/fixedtoc
...
Fixed commandline/index warning in TOC
Upstream-commit: 31274ffccb954bde88c973719c949894cc02d314
Component: engine
2014-01-21 10:52:13 -08:00
a290d454f3
Merge pull request #3671 from tianon/completion-ignore-stderr
...
Update bash completion to ignore stderr output of docker binary
Upstream-commit: 678d76fa9cd11dc57af405653b26be9323139e7f
Component: engine
2014-01-21 10:40:23 -08:00
875dd77195
Re-add kernel Flavor tests
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
Upstream-commit: cce099aa34e9588abc778b5f106bf862d4a838b0
Component: engine
2014-01-21 09:56:53 -08:00
bbcbe4bcf1
Merge pull request #3459 from Barthalion/master
...
Fix mkimage-arch.sh to generate cleaner Arch Linux images and do so with cleaner code
Upstream-commit: b23e6e99b38edf8453dbbcc21302cda6ff1d0cdf
Component: engine
2014-01-21 07:11:57 -08:00
7f4f60d7bd
mkimage-arch: provide and use own pacman.conf
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: 4137a0ea327ea1775c1b57892fd684da2c738f3e
Component: engine
2014-01-21 14:22:56 +01:00
0d4fdafaa4
Fixed commandline/index warning in TOC
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: fabf96b8ff5560523d60269d0052b65037394dcc
Component: engine
2014-01-21 08:22:51 -05:00
