a56db00ab7
Merge pull request #3747 from crosbymichael/move-networking
...
Move IP Allocator into sub package and out of the core
Upstream-commit: 641005777aa1b27ec0eb778fa810ed8aa53bae3b
Component: engine
2014-01-23 16:43:21 -08:00
c491c97966
remove useless anonymous field mentions
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 42e35ecff36fcb07e45c19f880af84f8532a3fac
Component: engine
2014-01-23 16:20:51 -08:00
2491610f84
move build to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 415379e45dadb32385771ceae701d8b9f204f2b8
Component: engine
2014-01-23 16:08:05 -08:00
5ee57b9d0c
Merge pull request #3730 from SvenDowideit/JSON-RUN-format-docs
...
talk about the new exec form of RUN (Closes #3723 ) implemented by #3558
Upstream-commit: a71e7fe8ab0fdee28b4cf062d17082568b383002
Component: engine
2014-01-23 15:54:00 -08:00
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
57e87d938b
Refactor and fix register interface when bridge does not exist
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ec73c232318a3dae803a27a6922f0af7117eec6e
Component: engine
2014-01-23 14:39:10 -08: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
e16cdc0102
Finalize core changes with new package
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ea5b3e193ba40b65c38c774e9abb85340c52e8c6
Component: engine
2014-01-23 05:22:32 -08:00
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
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
9f4a307e6f
talk about the new exec form of RUN ( Closes #3723 ) implemented by #3558
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: bfc1043f36dcce7f6232be55148f52327e356933
Component: engine
2014-01-23 14:00:16 +10: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
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
a82c275068
don't user os.Stderr in attach
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e7a9d236402363b402df43f25624a4e7e049f40f
Component: engine
2014-01-22 15:54:22 -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
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
6e009b9cf4
move the contributing hook into hack, and use curl in the same way as the gofmt above
...
and remove the fmt-check one we don't document
tianon tells me they're called GitHub, not Github :)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 7c55cbd4c9da88ffb4b1a325ba2e5435e337a3af
Component: engine
2014-01-22 21:31:42 +10: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
