11aa2d4639
Clean up grammar on puppet.rst
...
Upstream-commit: 03d9984f177ec1d093011bcf3693338dabecc19e
Component: engine
2014-01-27 15:13:17 +03:00
80cd671c19
Improve test for container list ps
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
Upstream-commit: 1ee1dc2340ef030fc3ed132ff51d196536b46600
Component: engine
2014-01-26 23:14:50 +00:00
fa1cce6c36
Fix issues from rebase on master
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5e69b3837b26d1d1f7cd8b3c4f5b077ba642bd20
Component: engine
2014-01-26 14:07:43 -08:00
1feadd553a
Simplify logic for registering ports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: da61b99b392657343df4dc221ba5cd9ad6b1c9e1
Component: engine
2014-01-26 14:01:38 -08:00
c14df520ff
Refactor to support multiple ip addresses
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ac2a4e64106b28d7b05d1ee31716af365424ff83
Component: engine
2014-01-26 14:01:38 -08:00
ad36af979f
Remove std sort and use custom sort for performances
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: da30eb7c2038c8c554e1f44c80c061c7a827a429
Component: engine
2014-01-26 14:01:38 -08:00
c104696fd4
Add port allocator and move ipset into orderedintset
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 303ed3c8300183bab09a36b58e0c1db89d12424a
Component: engine
2014-01-26 14:01:38 -08:00
d51ad14ef1
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: b994c1315997945815e7b927b8493595b194d016
Component: engine
2014-01-26 13:24:03 -07:00
47410e7905
Use exec to replace bash with apache2 after environment is set up
...
Docker-DCO-1.1-Signed-off-by: Mike Naberezny <mike@naberezny.com > (github: mnaberez)
Upstream-commit: 2ba2a8ae40b83ac1cc0c4a60724073fa8255b257
Component: engine
2014-01-26 11:53:22 -08:00
ebab9ce224
Merge pull request #3771 from srt32/patch-1
...
Update README.md typo
Upstream-commit: ffdc2d265713fc64516cffbcf6f2f80609d1cbdf
Component: engine
2014-01-26 09:07:00 -08:00
5d3cc5f71c
move image name into correct position
...
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com > (github: aaronfeng)
Upstream-commit: 31e59580092bd4f144bf512e2fd13dcba426b02a
Component: engine
2014-01-26 08:11:30 -05:00
4d09b5ba08
Update README.md
...
Docker-DCO-1.1-Signed-off-by: Simon Taranto <simon.taranto@gmail.com > (github: srt32)
Upstream-commit: 33ee78004f0f2a3cd760952f724c5ea0a9d24b37
Component: engine
2014-01-26 00:08:55 -07:00
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
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
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
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
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
6844d7aab2
Merge pull request #3727 from vieux/push_job
...
push job
Upstream-commit: 748a009cc41ca682377dc55ed287ed9c8bfd164c
Component: engine
2014-01-24 15:42:22 -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
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
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
e4d813640e
Merge pull request #3621 from vieux/inspect_job
...
Inspect job
Upstream-commit: 59df776469eed793556d3668465e604870219985
Component: engine
2014-01-24 15:22:20 -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
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
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
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
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
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
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
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
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
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
