toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,804 Commits 3 Branches 295 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph

21804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux
c7f2da1d18 fix docker login 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: d22a39db265dbf68cec4ddbc5903372e936094a9
Component: engine
 2014-02-01 01:14:59 +00:00
Victor Vieux
d8c614da79 Merge pull request #3878 from vieux/remove_REMOTE_TODO.md 
remove REMOTE_TODO.md
Upstream-commit: 23815414eaef5e943037b65303b1691b93942ad4
Component: engine
 2014-01-31 15:50:57 -08:00
Victor Vieux
c1283e0d50 remove REMOTE_TODO.md 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: bf1f655fa2b5112301102f9191e0f0deb68975f1
Component: engine
 2014-01-31 23:50:34 +00:00
Michael Crosby
4a2ebcd7e5 Merge pull request #3827 from vieux/mova_api_package 
Move api into sub package
Upstream-commit: 6a1ee89d2dcd5f2ab99e203862eed4dd8675b070
Component: engine
 2014-01-31 15:39:33 -08:00
Victor Vieux
140db53b4e Move serveapi to api/api.go 
Remove api import from server.go
Rename initapi to init server

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 9eea7f28f0c64d43ef2a9987999a29774fa1476b
Component: engine
 2014-01-31 23:06:00 +00:00
Victor Vieux
535edc5a50 Merge pull request #3876 from dotcloud/fix_panic_mflag 
fix panic in mflag
Upstream-commit: 78189c9bcf1b2ef8ebebbdb48c10b0ce0b8ae583
Component: engine
 2014-01-31 14:43:16 -08:00
Michael Crosby
e11ccc455a Fix IP case for BridgeIP 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cb3bd91689b9beaaa4e287e126bc8150b5161c57
Component: engine
 2014-01-31 12:18:45 -08:00
Michael Crosby
02ad82ce61 Fix links test to not accept bridge 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 50fea8978257141bf85669b9d757bf184f886a1b
Component: engine
 2014-01-31 12:07:51 -08:00
Michael Crosby
3d90516a7c Update code from pr #3842 post rebase 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a11bee44d74235ec436c1b2272dc9f718497f88c
Component: engine
 2014-01-31 12:04:44 -08:00
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
Victor Vieux
282ae4468c fix panic in mflag 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 65794a2c4960f9065ee439d6823ffe670610dbb6
Component: engine
 2014-01-31 11:39:29 -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
Victor Vieux
32d36c4ba5 merge master 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: b881a6c3c2e73f2fd342975239331004f0b59e12
Component: engine
 2014-01-31 19:00:06 +00: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
Victor Vieux
236fdd833b merge master 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 51d280f944eab386ecd67acd6a1878de7b45c8d6
Component: engine
 2014-01-31 18:43:34 +00: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
Abel Muiño
094438868d Ignore tar.TypeXGlobalHeader 
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com> (github: amuino)
Upstream-commit: ce74c8b4d2e68256d85063ee237c8d41174b27c3
Component: engine
 2014-01-31 14:57:30 +01:00
Abel Muiño
dcb9b96902 Unit test ensuring that a tar.TypeXGlobalHeader does not cause an error 
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com> (github: amuino)
Upstream-commit: 7b2ec7fb2d13776ab02b63f32821519621b2c4e8
Component: engine
 2014-01-31 14:57:18 +01: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
Victor Vieux
bef9a1a530 remove some mkServerFromEngine 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: fc2f998822699c0c7e22e4fc791d10c3b1ea1e53
Component: engine
 2014-01-31 03:34:50 +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