toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,834 Commits 3 Branches 295 Tags
de913bbe6544f23f6363140dc3017e4134af5036
Commit Graph
5834 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Poimboeuf 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
Victor Vieux 2a36ccea3e Merge pull request #3757 from vieux/auth_job 
move auth to a job
Upstream-commit: e6ae8f6d21f8d3a140e4c96a4fbe6786fe866ea9
Component: engine
 2014-01-24 16:54:48 -08:00
Victor Vieux 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
Victor Vieux 2b910ab2c2 Merge pull request #3728 from vieux/container_job 
Move containers to a job
Upstream-commit: e2003fea3a5ddf560cc4b9677045e459c196dd53
Component: engine
 2014-01-24 16:10:46 -08:00
Victor Vieux 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
Victor Vieux 6844d7aab2 Merge pull request #3727 from vieux/push_job 
push job
Upstream-commit: 748a009cc41ca682377dc55ed287ed9c8bfd164c
Component: engine
 2014-01-24 15:42:22 -08:00
Victor Vieux 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
Victor Vieux ffeff9b5a1 Merge pull request #3739 from vieux/events_jobs 
move events to job
Upstream-commit: 4a708f9f5b394f7e669de49b80f832ceda5b6876
Component: engine
 2014-01-24 15:32:25 -08:00
Victor Vieux 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
Victor Vieux e4d813640e Merge pull request #3621 from vieux/inspect_job 
Inspect job
Upstream-commit: 59df776469eed793556d3668465e604870219985
Component: engine
 2014-01-24 15:22:20 -08:00
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 2e6d0c8a82 Merge pull request #3645 from vieux/rmi_job 
Move rmi to a job
Upstream-commit: 22fb3e0f38fb9e89bdea20f19eedbfad801353c8
Component: engine
 2014-01-24 15:10:02 -08:00
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux c8e04b4c78 Merge pull request #3725 from vieux/pull_import_job 
Pull import job
Upstream-commit: 4a96c329c0f874908b64fe7ca18dfc24f78e2bd2
Component: engine
 2014-01-24 14:47:40 -08:00
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
James Turnbull 1f4b52b585 Merge pull request #3748 from metalivedev/fixarticles 
Fix TOC for Articles
Upstream-commit: f1fbf5f219dbf8cb2fb7c1112748e2c1aef11de4
Component: engine
 2014-01-24 10:01:54 -08:00
Andy Rothfusz 0badcc35ea Fix TOC for Articles 
Upstream-commit: 6cae33ca0f78ce8b7f1250e1f85828cfb242b12f
Component: engine
 2014-01-23 18:55:26 -08:00
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Andy Rothfusz 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
Victor Vieux 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
Victor Vieux 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
Paul Morie 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
Victor Vieux faed35fbdd Merge pull request #3742 from vieux/update_todo 
no more TODO
Upstream-commit: 189693461686ec16f77f7336262ef2adb58971bd
Component: engine
 2014-01-23 12:57:00 -08:00
Victor Vieux 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
Victor Vieux f89f5d99a2 Merge pull request #3740 from tianon/fix-mflag-dyntest 
Fix mflag test issue with "ResetForTesting"
Upstream-commit: 4e08bb56299b6894f93557602a533ca95b58b81f
Component: engine
 2014-01-23 12:09:08 -08:00
Tianon Gravi 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
Victor Vieux d1be3197f9 Merge pull request #3738 from vieux/update_todo 
update REMOTE_TODO.md
Upstream-commit: 7687b3cec1b046453cba007678053489609f86b2
Component: engine
 2014-01-23 10:51:38 -08:00
Victor Vieux 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Tianon Gravi 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
Sven Dowideit 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
James Mills 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Guillaume J. Charmes 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
Michael Crosby 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