toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,983 Commits 3 Branches 295 Tags
e1a338aef65c35f300c9f11b73a49d9fb2ec1258
Commit Graph
5983 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby e1a338aef6 Fix port mapping unit tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1d4de9ce1fe2c113cd7e9fcb6055b95c94c65b06
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby b6b8e6cc38 Move network aspect of links into driver as a job 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 167403988dca37060edf37abbdd28360ee0d5d4a
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby 844634dcc8 Implement requesting the name ip 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2df01661071e949faabf1fa9ba612c40710b686b
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby 052a914774 Fix integration tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 49b9813035b3abb445ef7238f034897fa03a9652
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby 2879fa9100 Fix sending []byte in job env 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2d8709696c80e992a5b20ba7a00ca3268c57c11c
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby 0b250038dd Update core calls to network drivers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c712e74b45005e0f38297d254fb606aa18606d11
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby fcfec10c8e Finish moving networking information into driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 90494600d357d01310d8da1310b6ad02f56de22c
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby 3044e71de0 Merge pull request #3841 from alexlarsson/separate-base-fs 
Separate out graphdriver mount and container root
Upstream-commit: 53ee1daa699ab28fdd37d77b2cfbb0fc14dc0fdb
Component: engine
 2014-01-31 11:49:14 -08:00
Victor Vieux df82456ed9 Merge pull request #3857 from creack/remove_darwin_files 
Remove all darwin specific files and use more generic _unsupported with build tags.
Upstream-commit: 523341d994265b9f72e4869f0fd094fd15f1b480
Component: engine
 2014-01-31 11:48:10 -08:00
Michael Crosby 47c49018cf Merge pull request #3828 from tianon/add-user-email-to-dockerfile 
Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits
Upstream-commit: 674ee1bc8e378063831491bdbb2f8bfdc50cdfd3
Component: engine
 2014-01-31 11:03:17 -08:00
Michael Crosby db540896bd Merge pull request #3844 from clkao/lxc-kill-deprecation 
Use lxc-stop -k instead of lxc-kill
Upstream-commit: f267938fb8db682eb34a9c221a1b8c2288995206
Component: engine
 2014-01-31 10:57:40 -08:00
Guillaume J. Charmes 8e78d482bc Merge pull request #4 from tianon/cross-compile-and-release-linux-i386-and-arm-clients 
Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
Upstream-commit: ff6409382b0f78cf192b007689c68b074f55fc7c
Component: engine
 2014-01-31 10:51:25 -08:00
Michael Crosby 4ca789745b Merge pull request #3829 from vieux/fix_api_regression 
Fix ID -> Id api
Upstream-commit: 643c7dc25df4759c1894ba2ff3aa71fe11a06ea4
Component: engine
 2014-01-31 10:38:57 -08:00
Andy Rothfusz 4ae61a560f Merge pull request #3864 from SvenDowideit/lxc-kill-script-workaround-doc 
add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kil...
Upstream-commit: 70ab72ff32fdfd91e8ba8c2c294c649ec5e2d84a
Component: engine
 2014-01-31 10:27:04 -08:00
Andy Rothfusz 90c3a9efe5 Merge pull request #3861 from metalivedev/fixkerneldeps 
Fixed link to kernel dependencies. 
Upstream-commit: feea1dda41ea33533f358329348333236f587874
Component: engine
 2014-01-31 10:25:25 -08:00
unclejack aa9641f922 Merge pull request #3866 from crosbymichael/dont-allocate-1 
Do not allocate networks first ip
Upstream-commit: 5258f833bc2ed66f010a5296f86c6842b58a7969
Component: engine
 2014-01-31 09:47:28 -08:00
unclejack 60333d7a5e Merge pull request #3800 from vieux/cleanup_jobs 
Cleanup jobs
Upstream-commit: 35ef0d37c2f1e28d213e3e5e074c390cc8f42c60
Component: engine
 2014-01-31 06:55:12 -08:00
Tianon Gravi e8f6d5eb59 Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 065dd231dd7d7858df982a8decfade9df936cf63
Component: engine
 2014-01-31 03:16:42 -07:00
unclejack aa480bd754 Merge pull request #3125 from rjeczalik/master 
vagrant: added PRIVATE_NETWORK env var
Upstream-commit: 59ec012efc33f2821fac3acfb560a91726dbeb78
Component: engine
 2014-01-31 01:06:47 -08:00
Tianon Gravi 05ceb6e730 Merge pull request #3822 from tianon/install-your-user 
Make get.docker.io install directions slightly better by telling user exactly how to add themselves to the "docker" group
Upstream-commit: b4604ae7cf84bb45c7ba604c4ac875a29722287e
Component: engine
 2014-01-31 00:56:30 -08:00
Tianon Gravi 71cac1ed88 Merge pull request #3760 from tianon/better-nondocker-warning 
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
Upstream-commit: 56317c74f72d7f02c9a2c7d2c8d5b2d388265d70
Component: engine
 2014-01-31 00:54:44 -08:00
Tianon Gravi cc74f2fe8e Merge pull request #3848 from tianon/fix-yaml-space-parsing 
Fix fun Travis DCO check YAML parsing issues (especially with commit messages that start with any kind of whitespace, like this one intentionally does)
Upstream-commit: d009cb0bedc08df71d6f780d19de033062fab4a4
Component: engine
 2014-01-31 00:53:47 -08:00
Michael Crosby aea7b45d61 Not not allocate networks first ip 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d86c1b064dad349737b4a423fe8d0c42db4ca45e
Component: engine
 2014-01-30 23:10:19 -08:00
Victor Vieux 9365dcaac9 add setSubEnv and getSubEnv 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 8fbdb7b59eba078bf24546686e005cc86a60e493
Component: engine
 2014-01-31 04:01:46 +00:00
Victor Vieux b237b19a08 job.error\* now return engine.StatusErr 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 24086fa75dff1ebb56dfb8fbf2c80fdfd5be0e8a
Component: engine
 2014-01-31 04:01:46 +00:00
Victor Vieux d1aba4a6ea Remove api_params.go 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 2b52d6e801dd888e1f5759448da025e0ddcffedd
Component: engine
 2014-01-31 03:59:14 +00:00
Solomon Hykes 0902281324 Merge pull request #3863 from vieux/default_getint_0 
changed default value of getenvint to 0. fix tests
Upstream-commit: a0d82b17c7093ec6d98e4d8fce1057bcf403948d
Component: engine
 2014-01-30 19:04:46 -08:00
Sven Dowideit 62ffc05f30 add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kill see #3844 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 630459f2b84c9664b436eb076cfac39d731f08bf
Component: engine
 2014-01-31 12:30:16 +10:00
Victor Vieux f6edb78234 use exists 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 1498cd4e0540c73546a4847948f7d6a75b596178
Component: engine
 2014-01-31 02:21:59 +00:00
Victor Vieux c57257cc3c changed default value of getenvint to 0. fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 28b5ae8cc4492f7b3cc2eb2b30b0f41713822b25
Component: engine
 2014-01-31 02:06:08 +00:00
Rafal Jeczalik e4c87a3cde vagrant: added PRIVATE_NETWORK env var 
Docker-DCO-1.1-Signed-off-by: Rafal Jeczalik <rjeczalik@gmail.com> (github: rjeczalik)
Upstream-commit: ce423cc9a8b9552ee8bb75f3aac81d291f85375c
Component: engine
 2014-01-31 02:03:57 +01:00
Tianon Gravi 187e21e1c0 Merge pull request #3860 from vieux/integration_makefile 
Add "make test-integration"
Upstream-commit: 7ced2043721cb35a07721e82be2daffae6a29119
Component: engine
 2014-01-30 16:10:27 -08:00
Andy Rothfusz cc8be8350a Merge pull request #3758 from metalivedev/2720-running 
Fixes 2720
Upstream-commit: e64a9a3bada4864a9358cffdf09aed0290c52a33
Component: engine
 2014-01-30 16:09:19 -08:00
Andy Rothfusz cdd32376a9 Fixed link to kernel dependencies. Wrapped long lines. Removed old tar dependency from list. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 98518bbcad85217ac36112f6a18a275816b38287
Component: engine
 2014-01-30 16:03:13 -08:00
Victor Vieux e5537faa28 Merge pull request #3858 from vieux/fix_testexitcode 
fix TestExitCode
Upstream-commit: e4b3b391d6d80e1519bb8a9347fae57a25300a79
Component: engine
 2014-01-30 15:52:28 -08:00
Victor Vieux b3054dc35d add make test-integration 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 4326e541f843e5c053221f15fef546b42ba29e25
Component: engine
 2014-01-30 23:50:23 +00:00
Guillaume J. Charmes af03824925 Merge pull request #3859 from rogaha/add_missing_attributes 
- Fixed the last cli.call's parameter from CmdSearch
Upstream-commit: 9ae51c7403c75dfa746afc0a50d7c28b87d72d97
Component: engine
 2014-01-30 15:44:36 -08:00
Roberto G. Hashioka 91d61b7621 - Fixed the last cli.call's parameter from CmdSearch 
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
Upstream-commit: 2655a108e1950534f0fa1d6034ab61444fe35ee5
Component: engine
 2014-01-30 23:21:42 +00:00
Guillaume J. Charmes 185286d85e Remove all darwin specific files and use more generic _unsupported with build tags. 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 45dd051e8ee2e0e18d8ffec99f65878c20bd11e9
Component: engine
 2014-01-30 23:10:56 +00:00
Victor Vieux 38ee88c4ce fix TestExitCode 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 720f64af1855235b6f518ad97dbb89eb61191222
Component: engine
 2014-01-30 22:59:21 +00:00
Victor Vieux 26a8ad8626 Merge pull request #3854 from vieux/fix_tests 
remove TestAllocateTCPPortLocalhost faillure in tests
Upstream-commit: 9481afa6172c8d50ffe6d5c9eff80d36361fa11e
Component: engine
 2014-01-30 13:59:32 -08:00
Victor Vieux d1401083fb remove TestAllocateTCPPortLocalhost faillure in tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 8e619e13ca3906e849944a4b015b676b93c9f145
Component: engine
 2014-01-30 21:53:32 +00:00
Victor Vieux 827d047fb2 Merge pull request #3833 from vieux/fix_env_conversion_issues 
Fix env conversion issues in env
Upstream-commit: 0c8ddd502e90d5e35c04179f98f29fc4550af5c9
Component: engine
 2014-01-30 13:31:25 -08:00
Victor Vieux deac379ef5 refactor all *FromJob functions 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 9261511aa509423432f4e22f6235719deadc0969
Component: engine
 2014-01-30 20:45:32 +00:00
Tianon Gravi f121a9a07b Fix fun Travis DCO check YAML parsing issues (especially with commit messages that start with any kind of whitespace, like this one intentionally does) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c8d1596902704076c8d85a30e80f90f8efb3e175
Component: engine
 2014-01-30 12:27:45 -07:00
Victor Vieux aea7223441 Merge pull request #3842 from jpoimboe/iptables-insert-masq 
network: insert masq rule
Upstream-commit: 0942e5c89cb8554cb50a680df0004abee63bb0d1
Component: engine
 2014-01-30 11:26:32 -08:00
Chia-liang Kao 113400b4e9 Use lxc-stop -k when lxc-kill is not found 
lxc-kill was removed in lxc/lxc@33ddfc2

Docker-DCO-1.1-Signed-off-by: Chia-liang Kao <clkao@clkao.org> (github: clkao)
Upstream-commit: b111fc364611d755ac791c5c51c82c5754fe545b
Component: engine
 2014-01-31 03:22:22 +08:00
Andy Rothfusz 41e844d181 Merge pull request #3836 from SvenDowideit/mint-cgroups-lite-docs 
Add troubleshooting for missing cgroups on mint 16
Upstream-commit: 43b7667dccc4a08cf12a17548df359e0ba118ae1
Component: engine
 2014-01-30 10:58:26 -08:00
Victor Vieux 40e944384d Merge pull request #3846 from tianon/unclejack-maintainer 
Make unclejack the official Vagrantfile maintainer
Upstream-commit: c7b415d3b4904ba5b00ed60e544bf9eadccd2219
Component: engine
 2014-01-30 10:55:38 -08:00
Tianon Gravi 1cbb6220de Make unclejack the official Vagrantfile maintainer 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 238dba831a74c89fe8f5aabc836e6b75da577c97
Component: engine
 2014-01-30 11:51:25 -07:00