7bb370a46e
Update code for new test cases
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9d11db0f8c2be614f18eec856f11edbff5da17fe
Component: engine
2014-01-23 02:22:13 -08:00
f755b9590d
Move tests from core into ipallocator
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: fccca3542b91513dd0da73db21ffa3ced4dd9b7f
Component: engine
2014-01-23 01:31:38 -08:00
ce6ce4f2a7
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
...
Upstream-commit: 648357ffdf6670810383be6437b8a5f8a38d4e42
Component: engine
2014-01-23 00:28:35 -08:00
c4b5bd0ce8
Implement pos for set and add unit tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 79bb8212e05cc9c14b8edda2b8a924fef63ea2e0
Component: engine
2014-01-22 19:34:47 -08:00
ebcfd87643
Finish implementation and begin working on tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 6bc05899aa5023fdda0441b76a829d0e9a6f6dea
Component: engine
2014-01-22 18:05:20 -08:00
8a240a149a
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 78b3d89f87bd6017416a48fcfd9118acd9910a51
Component: engine
2014-01-22 17:20:52 -08:00
fcb24c5b66
Use int32 instead of string for ip set
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 3e3abdd770bdc23c409a9e49619a1897ffbf2354
Component: engine
2014-01-22 17:20:19 -08:00
acc4af4393
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9c29376fcb9c4c5e2217a7b10dfd81e09403184a
Component: engine
2014-01-22 17:13:13 -08:00
dda70b8c6c
Implement PullBack()
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 18df387bf8a4a1419b6d3267a4e0551ff72b0f88
Component: engine
2014-01-22 17:12:28 -08:00
8e2415caf3
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b58c1a6438e5b72e6dfd5e498672669511a484f3
Component: engine
2014-01-22 16:24:55 -08:00
31d247bfc1
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e048c28159313ec7e3b55982b55ea0eba6befc6e
Component: engine
2014-01-22 16:13:59 -08:00
89dcf8ee2f
Implement Containers in set
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 43bcbf06a663c5d8cac63f2af8fefef7edc5513a
Component: engine
2014-01-22 16:13:28 -08:00
ef69ef49b5
Implement get next ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d32777f6b1f3a5dff6df0e285b9cd68b2c0d00ad
Component: engine
2014-01-22 16:13:22 -08:00
90791dd030
Implement basic stack for ips
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 63d18d875b8a136d59c98b7b571366b10b5d4f76
Component: engine
2014-01-22 16:00:53 -08:00
5cb56f7078
WIP for ip allocator
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9e2e8a923c28833dd631a7206d3664a6a90cc24c
Component: engine
2014-01-22 15:52:39 -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
961f481ab0
Merge pull request #2655 from mpetazzoni/create-local-bind-dirs
...
Automatically create non-existent bind-mounted host directories
Upstream-commit: 980000071d93116d79fb652bd901abca15afc4b7
Component: engine
2014-01-21 16:27:20 -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
