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

5563 Commits

Author SHA1 Message Date
Tianon Gravi
4621ae86b1 Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable 
Everyone probably wants to run `docker pull ubuntu` before building with this change.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f4a7c437769b5cf25d852d1aee6a6c50ee42fc85
Component: engine
 2014-02-03 11:08:35 -07:00
Michael Crosby
f8aac524dd Merge pull request #3904 from alexlarsson/fix-docker-commit-output 
Fix docker commit output
Upstream-commit: 686314514830547dafd7c736acee4a4a758b0ae9
Component: engine
 2014-02-03 10:00:53 -08:00
Michael Crosby
23812229e0 Merge pull request #3893 from tianon/clean-up-btrfs-error-messages 
Fix several btrfs driver error messages
Upstream-commit: 9431b8d503e1fc02e22431fded0c15e4a7dc4b0c
Component: engine
 2014-02-03 09:51:41 -08:00
Michael Crosby
67cb10e065 Merge pull request #3892 from tianon/remove-btrfs-header-reference 
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
Upstream-commit: fb796900fbcd11ae63e918f91b226463619bb152
Component: engine
 2014-02-03 09:41:11 -08:00
Tianon Gravi
e9fcfe019f Fix several btrfs driver error messages 
Several of the error messages were wrong, but not one of them was helpful, so this fixes them to include the important information (the actual error), and a correct description of which operation failed.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f7f8e3c2b3818d351781f96ef68432eba0fc2fda
Component: engine
 2014-02-03 09:12:18 -07:00
Alexander Larsson
52ef7a7013 Fix docker commit output 
The id is returned as Id, not ID, so print the right thing.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: b61c1d0d42777023a6248c6e9de4bb4877a1857b
Component: engine
 2014-02-03 14:59:09 +01:00
Tianon Gravi
f2667b61da Update PACKAGERS.md to explicitly talk about stripping, quoting Dave Cheney from Golang upstream (who is very, very adamant about not stripping Golang compiled binaries) 
While there, remove the now-outdated section about `CGO_ENABLED=0`

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7ffd2b0785529b0b71bec90c8468dc3cb4b37525
Component: engine
 2014-02-02 22:47:42 -07:00
Tianon Gravi
6732035ba0 Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs) 
This fixes compilation issues when btrfs.h isn't available (because we just need the relevant structs, which for userspace programs are supposed to come from btrfs-progs instead of the kernel headers).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 6922f1be08111d889b0585b763b08f92d7a55e05
Component: engine
 2014-02-01 23:23:33 -07:00
Victor Vieux
a5ec5d6bb6 Merge pull request #3832 from jlhawn/3831-auth-tests-server-address 
Prevent Tests from creating users on Prod Index
Upstream-commit: a446b347199b3b19abf06e2ccf115d926917620f
Component: engine
 2014-01-31 18:34:13 -08:00
Guillaume J. Charmes
8b69044d5c Merge pull request #3881 from crosbymichael/no-all-number 
Do not generate all numberic truncated ids
Upstream-commit: c9f6e446eedce31c8fde15f8b198069546be3125
Component: engine
 2014-01-31 18:07:01 -08:00
Guillaume J. Charmes
31578849e3 Merge pull request #3868 from 1uptalent/3867-allow-pax-global-extended-headers-to-passthrough 
FIX 3867 allow pax global extended headers to passthrough
Upstream-commit: f9b4146ad48f992d17ca8aa530ab5bef75400c31
Component: engine
 2014-01-31 17:54:08 -08:00
Michael Crosby
b5105f20b1 Do not generate all numberic truncated ids 
Fixes #3869
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 9b7054fd0bc707f7f8e5c9ed9ada5a1664a19a34
Component: engine
 2014-01-31 17:37:13 -08:00
Guillaume J. Charmes
85b3df31cc Merge pull request #3880 from vieux/fix_docker_login 
fix docker login
Upstream-commit: 87c14039481e69add8c1cc2be70c41e23b6a8d31
Component: engine
 2014-01-31 17:31:27 -08:00
Victor Vieux
1ec7d7b519 Merge pull request #3882 from vieux/fix_compat_api 
fix api with old version
Upstream-commit: 31ee45e6aecd42f187a25d401ec2488f70e2b332
Component: engine
 2014-01-31 17:25:39 -08:00
Victor Vieux
284cf5fe96 fix api with old version 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e43236c78ae8a466a36c323aa679ea581b42cdc5
Component: engine
 2014-02-01 01:24:39 +00:00
Guillaume J. Charmes
47dc263009 Merge pull request #3872 from crosbymichael/network-driver 
Remove networking out of core and into a driver
Upstream-commit: 819c2e3ecaaa1f82401fe76bae1715183426c3cf
Component: engine
 2014-01-31 17:22:37 -08:00
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
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
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