toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,012 Commits 3 Branches 295 Tags
52ef7a701387749140cb27f6bf4d605f27217fce
Commit Graph
6012 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Rothfusz 254ce5fef5 Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg 
move the contributing hook into contrib, and use curl in the same way as the gofmt above
Upstream-commit: bbfc531b51cb17e97022ff0e904f91faac48713f
Component: engine
 2014-01-27 12:09:03 -08:00
Andy Rothfusz d680ae54b5 Merge pull request #3781 from mattymo/patch-1 
Clean up grammar on puppet.rst
Upstream-commit: 093531ddb7f4ee53cd166bfd9316af0c1de7424c
Component: engine
 2014-01-27 12:06:43 -08:00
Andy Rothfusz 8e2497b678 Merge pull request #3773 from mnaberez/supervisord-apache2-example 
Use exec to replace bash with apache2 after environment is set up
Upstream-commit: adae0b248d6f6732f15ef96f856ac097d038a181
Component: engine
 2014-01-27 12:01:59 -08:00
Andy Rothfusz 0e5f62a6b2 Merge pull request #3770 from aaronfeng/fix-image-name-pos 
move image name into correct position
Upstream-commit: ef37fdd1a853fbef8cbabe1a34c527d278589067
Component: engine
 2014-01-27 11:56:36 -08:00
Victor Vieux a025501ee9 Merge pull request #3756 from crosbymichael/fix-register-nobridge 
Refactor and fix register interface when bridge does not exist
Upstream-commit: f9e9637a9f42794ace5833f778705061e50fc4ca
Component: engine
 2014-01-27 10:40:42 -08:00
Peter Waller b28de2eada Fix for issue #3786 
This is a fix for the case that one mount is inside another mount and
docker can't then delete the resulting container.

Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: 32753c3d241c9238b2a34f61fd44399453d7b455
Component: engine
 2014-01-27 17:31:25 +00:00
Abel Muiño e2920619d5 Release the push lock at the end 
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com> (github: amuino)
Upstream-commit: 77a34920b24901da82f9e22138ef21ffc665d678
Component: engine
 2014-01-27 16:22:59 +01:00
mattymo b231028354 Update puppet.rst 
Upstream-commit: 551e1a766c8aaec190972e3542fd8a1c7452b6b2
Component: engine
 2014-01-27 18:21:48 +03:00
mattymo 11aa2d4639 Clean up grammar on puppet.rst 
Upstream-commit: 03d9984f177ec1d093011bcf3693338dabecc19e
Component: engine
 2014-01-27 15:13:17 +03:00
Fabio Falci 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Guillaume J. Charmes 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
Michael Crosby 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
Tianon Gravi 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
Mike Naberezny 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
James Turnbull 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
Aaron Feng 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
Simon Taranto 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
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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
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