de913bbe65
network: remove unnecessary links iptables rule for return traffic
...
Currently there are two iptables rules per port for each link: one to
allow the parent to connect to the child's port, and another one to
allow return traffic from the child back to the parent. The second rule
shouldn't be needed because the "ctstate RELATED,ESTABLISHED" rule can
already allow all established traffic.
So this patch does the following:
1. Move the RELATED,ESTABLISHED rule to be _before_ the potential
inter-container communication DROP rule so it will work for
inter-container traffic as well. Since we're inserting, everything
is reversed chronologically so it should be inserted _after_ we
insert the DROP. This also has a small performance benefit because
it will be processed earlier and it's generally one of the most
commonly used rules.
2. Get rid of the unnecessary return traffic rule per link.
3. Also move the other "Accept all non-intercontainer outgoing packets"
rule to earlier. This gives a small performance benefit since it's
also a commonly used rule, and it makes sense to logically group it
next to the ctstate rule.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
Upstream-commit: 5c04f1bcc70e81fe3c93b1c246ce17a11304ad7f
Component: engine
2014-01-24 21:20:34 -06:00
75afea3f4d
Update tests to have custom routes
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: b1d26985d0dfcbecc8264124fa81ff843a6d574b
Component: engine
2014-01-24 17:18:48 -08:00
4020a7cd25
Merge branch 'fix-register-nobridge' of https://github.com/crosbymichael/docker into crosbymichael-fix-register-nobridge
...
Upstream-commit: eedaf08eb8dc7a9a6265cc3d9bd62f614e89a411
Component: engine
2014-01-24 17:02:19 -08:00
70553c6361
move auth to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 1f8b1bb84e65cfd84f938eb01e1a48c33fce5a27
Component: engine
2014-01-24 16:51:02 -08:00
b7a9dba025
Move containers to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5ea2986ce5cfce1b86fdc92610dbc6d670691168
Component: engine
2014-01-24 16:07:42 -08:00
29cb397f3d
push job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e8ee18fa2993bd47069ba582889b0c83a68f3d43
Component: engine
2014-01-24 15:34:08 -08:00
043779a4ab
move events to job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5cc6312bfc4e511784693d02b9bb8e8d9d1c04b0
Component: engine
2014-01-24 15:28:17 -08:00
650f0e4bf5
merge 2 jobs, no more buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5fd8aa02bae6602bfe6bff541be1e1dc5c1e0fb8
Component: engine
2014-01-24 15:13:30 -08:00
f3fc21caa0
update attach to use the new job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a7e9baaf89ae86dba4f93fb76a436e4c86249e4c
Component: engine
2014-01-24 15:11:38 -08:00
760e8be989
move inspect to 2 jobs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 134435a79c06bd178aa6f687fcabeb2caced485a
Component: engine
2014-01-24 15:11:38 -08:00
32ee8c9560
fix error handling
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: f41e0cf0485eac21d65c1af19a732b350292d200
Component: engine
2014-01-24 14:59:46 -08:00
0c66a1deba
remove buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 177f6588824de5a489f0b31a2cf053c3cdf0bb0e
Component: engine
2014-01-24 14:57:18 -08:00
4dfa12a504
Move docker rmi to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 564e6bc7802b606d829a498eee0c2bb8ce4032e1
Component: engine
2014-01-24 14:55:11 -08:00
336aee840a
remove useless flush method
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 35641f0ec7ecae16f88ba9affe0aeea0ae864874
Component: engine
2014-01-24 14:46:31 -08:00
0b480b0b5d
fix flush
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 90e9a2d85a6c981b137df0c22c31d6f32f4b6f66
Component: engine
2014-01-24 14:46:31 -08:00
10c689f549
move pull and import to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 9dcbdbc4b1addb67c0fdcadab1c8f98f30e58b4c
Component: engine
2014-01-24 14:46:31 -08:00
37c92d18d0
Merge pull request #3741 from vieux/build_job
...
move build to a job
Upstream-commit: 9d44298c5e733e0e36973a765af77b28861d542d
Component: engine
2014-01-24 11:34:32 -08:00
196598a9bb
Merge pull request #3726 from vieux/attach_stderr
...
don't user os.Stderr in attach
Upstream-commit: 56ec1219254a52d49dbf9c05091b09f0fe5cd719
Component: engine
2014-01-24 10:55:55 -08:00
0badcc35ea
Fix TOC for Articles
...
Upstream-commit: 6cae33ca0f78ce8b7f1250e1f85828cfb242b12f
Component: engine
2014-01-23 18:55:26 -08:00
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
b1ef6f3d68
fix shebang in mkimage-yum.sh
...
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com > (github: stpierre)
Upstream-commit: fd2403b8303f7ea9152dd08021d2c9c7070aefb4
Component: engine
2014-01-23 12:01:24 -05: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
3123b44774
Added new mkimage-yum.sh script to create CentOS base images
...
mkimage-rinse.sh requires rinse, which is not readily available on
CentOS or Fedora. Plus, creating a base image is trivial with yum
alone.
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com > (github: stpierre)
Upstream-commit: d419da7227826e84e9375ece4fd9d4978a42cbf7
Component: engine
2014-01-23 07:09:44 -05: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
