toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,796 Commits 3 Branches 295 Tags
5157a0363c29f168d37beeaa0d2e21e23a32dc4c
Commit Graph
15796 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi 5157a0363c Merge pull request #13532 from jfrazelle/fix-fix-release-script 
fix release script
Upstream-commit: 15b45113eb4aaeca9c289c22f772deead0024560
Component: engine
 2015-05-27 23:17:45 -06:00
Jessica Frazelle a3f2ea4982 fix release script 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 9f619282dba2f42ada6f7e92705a1c8979193214
Component: engine
 2015-05-27 20:57:46 -07:00
Tibor Vass 553a8c069a Merge pull request #13374 from RichardScothern/v2-mirror 
V2 mirror support
Upstream-commit: 2daede5a9cc6cc171f2f1f3aebcae561a2421d18
Component: engine
 2015-05-27 21:15:26 -04:00
Arnaud Porterie 32f8a6c6ff Merge pull request #13518 from mrjana/clone 
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
Upstream-commit: c2e8f07a052505c07c4fe38da8e2d5139ffa00a4
Component: engine
 2015-05-27 17:42:10 -07:00
Richard 430d1ade67 Review feedback: 
- Match verbiage with other output
    - Remove dead code and clearer flow

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
Upstream-commit: e817e08481b91638037e55b8d4855f56814c81f5
Component: engine
 2015-05-27 17:29:24 -07:00
Jana Radhakrishnan 9218287317 Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: d429465b37b29f72109e373379580f020d3ff9ee
Component: engine
 2015-05-28 00:04:01 +00:00
Tianon Gravi 01b03d6fa4 Merge pull request #13477 from kvasdopil/freebsd-build 
Make hack/make.sh work on FreeBSD
Upstream-commit: c9d3681a5d0cd2d275299146855283fa89c6cdd9
Component: engine
 2015-05-27 17:42:49 -06:00
David Calavera d364303d1d Merge pull request #13496 from Microsoft/10662-windefaults 
Windows: Set default exec driver to windows
Upstream-commit: 49e734c6e472fd9d6750e7666a19d489d5c28d70
Component: engine
 2015-05-27 16:02:24 -07:00
Richard f4eb0aeb64 Restore the stripped registry version number 
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
Upstream-commit: f6f7d3524862563f8388e1382bb28ecbde8cf265
Component: engine
 2015-05-27 15:15:47 -07:00
Arnaud Porterie 1f5c180c11 Merge pull request #12572 from jfrazelle/selinux-labels-carry 
Modify volume mounts SELinux labels on the fly based on :Z or :z
Upstream-commit: ec471a7c9b307eb656aeb69ef00910b2fb388e1c
Component: engine
 2015-05-27 14:46:16 -07:00
Brian Goff c59e5318a9 Use SELinux labels for volumes 
Fixes a regression from the volumes refactor where the vfs graphdriver
was setting labels for volumes to `s0` so that they can both be written
to by the container and shared with other containers.
When moving away from vfs this was never re-introduced.
Since this needs to happen regardless of volume driver, this is
implemented outside of the driver.

Fixes issue where `z` and `Z` labels are not set for bind-mounts.

Don't lock while creating volumes

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b2a43baf2e2cc68c83383a7524441f81bc4c4725
Component: engine
 2015-05-27 13:43:38 -07:00
David Calavera c6b125f030 Merge pull request #13449 from duglin/FixRaceInStop 
Fix race condition on container stop
Upstream-commit: f5d33118394464e52eb29c781c1a8bb9345778c8
Component: engine
 2015-05-27 13:05:53 -07:00
Jessica Frazelle 3a11c11495 apply selinux labels volume patch on volumes refactor 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: af7d17a6c906d348eb0929766a81fd04fc173c44
Component: engine
 2015-05-27 12:50:16 -07:00
Dan Walsh 1adf295b9a Modify volume mounts SELinux labels on the fly based on :Z or :z 
This patch is extending the qualifiers on the -v command to allow
an admin to tell the system to relabel, content. There might be a
need for something similar for changing the DAC Permissions.

Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 160dc79db095767de74deb75b8e1ae86f213593c
Component: engine
 2015-05-27 12:50:16 -07:00
Alexander Morozov 773a1624ef Merge pull request #13507 from hqhq/hq_remove_redundant_set_header 
Remove redundant set header
Upstream-commit: 7b57fae04668cc4841f0d31f8ce16ac8d044b446
Component: engine
 2015-05-27 10:44:57 -07:00
David Calavera a7ae3fbbff Merge pull request #13483 from jfrazelle/lxc-we-meet-again 
fix lxc tests unshare, they dont use our apparmor profile
Upstream-commit: 26650e2cccc72bcc7d62e3208e3a69316272e883
Component: engine
 2015-05-27 10:22:31 -07:00
Doug Davis 810a7285de Merge pull request #13506 from hqhq/hq_fix_wrong_return_nil 
Return err if we got err on parseForm
Upstream-commit: b29f3bb1c306e3fa52ec24e9011cafed89eef9c9
Component: engine
 2015-05-27 12:38:53 -04:00
Alexander Morozov d177b20750 Merge pull request #13493 from jlhawn/volume_unmount_fix 
Fix container unmount networkMounts
Upstream-commit: 2029257e3cfd524b5fec0288eef039f182e460f7
Component: engine
 2015-05-27 08:44:11 -07:00
Phil Estes 81ebc3c70c Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe 
Fix unregister stats on when rm running container
Upstream-commit: f3e56420a311378de030f7e3240fbdf6295c0b7e
Component: engine
 2015-05-27 11:10:36 -04:00
Antonio Murdaca b97117116a Merge pull request #13500 from HuKeping/cleanup 
Remove unused code
Upstream-commit: 3f66f6f2f066d46f554deec55284377ee726a028
Component: engine
 2015-05-27 13:59:40 +02:00
Hu Keping 0767c7dcb9 Remove unused code 
As far as I see, it's a dead code.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: a34cb321865c16ac42a12fe32fa3c8c4a5ffd263
Component: engine
 2015-05-27 22:39:02 +08:00
Qiang Huang a7e8383688 Remove redundant set header 
Which is already done in writeJSON.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 94d604357ff9cf7a5fcc4d98ffe58f804adf0ae6
Component: engine
 2015-05-27 18:25:57 +08:00
Qiang Huang d3998344e0 Return err if we got err on parseForm 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 7c7aebfcfef46337aa4e20f9d024916f71650545
Component: engine
 2015-05-27 18:16:28 +08:00
Alexey Guskov af2789e761 script cleaned up 
Signed-off-by: Alexey Guskov <lexag@mail.ru>
Upstream-commit: f228fb09acffde575c704d501739ad547baf4e24
Component: engine
 2015-05-27 10:21:09 +03:00
Brian Goff 49dc08b2f2 Fix unregister stats on when rm running container 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b3e8ab3021d2021202e14b912e7fdbfede4c7c20
Component: engine
 2015-05-26 22:22:03 -04:00
moxiegirl af47afb0d1 Merge pull request #13406 from moxiegirl/experimental-work 
Placeholder Part II: For commenting about install
Upstream-commit: e580734149c646adf1c939cc292bebc4950afde4
Component: engine
 2015-05-26 18:19:26 -07:00
Josh Hawn aee141571b Fix container unmount networkMounts 
UnmountVolumes used to also unmount 'specialMounts' but it no longer does after
a recent refactor of volumes. This patch corrects this behavior to include
unmounting of `networkMounts` which replaces `specialMounts` (now dead code).

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 04f99a6ca8232e43169b9a0706e435c551c798a3
Component: engine
 2015-05-26 17:38:26 -07:00
Arnaud Porterie d9b5b5714d Merge pull request #13491 from jfrazelle/revert-exec-privileged 
Revert "Add docker exec run a command in privileged mode"
Upstream-commit: b50e7809254c1d3cc9bd2b94be0c87b68576ed2a
Component: engine
 2015-05-26 16:41:50 -07:00
Brian Goff 46ea5fe0ee Merge pull request #13487 from calavera/volume_load_regression_test 
Add regression test to make sure we can load old containers with volumes.
Upstream-commit: 838e1a89472bac5c8307431de477d511dc78b95b
Component: engine
 2015-05-26 19:40:08 -04:00
Tibor Vass b58daceb88 Merge pull request #12881 from nakedible/patch-1 
Prevent fallback to v1 registry for digest pulls
Upstream-commit: 54b514735c592de77f3d79ec80c2d37bd589da6c
Component: engine
 2015-05-26 19:24:37 -04:00
John Howard 4abb12acf6 Windows: Set default exec driver to windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 041ba90dbb713656440fb5eadbd5aba892645350
Component: engine
 2015-05-26 16:17:33 -07:00
Mary Anthony 0c3a03c749 Fixes title, line wrap, and Adds install area 
Tibor's comment
Updating with the new plugins
Entering comments from Seb

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 1ba1a0550ff3fa98397cd93195cc33b8c2f6473a
Component: engine
 2015-05-26 15:37:38 -07:00
Alexander Morozov dc2caf8054 Merge pull request #13444 from runcom/fix-race-stats 
Fix race in stats cli and native driver
Upstream-commit: 0d445685b8d628a938790e50517f3fb949b300e0
Component: engine
 2015-05-26 15:34:50 -07:00
David Calavera ef63a3dd48 Add regression test to make sure we can load old containers with volumes. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ea0e15ba6244a539db646d947aaf9cafe88603f6
Component: engine
 2015-05-26 15:28:58 -07:00
Arnaud Porterie cd81890817 Merge pull request #13492 from calavera/donot_force_syscall_unmount_on_cleanup 
Do not force `syscall.Unmount` on container cleanup.
Upstream-commit: bd18d8625090c62605fa34fb8ccf703c6f59ec9e
Component: engine
 2015-05-26 15:23:16 -07:00
David Calavera f26677f4cf Do not force syscall.Unmount on container cleanup. 
This is not necessary and it's a regression from the old behavior.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f78dce152c3c67bf262648028ff7932ca461b6fd
Component: engine
 2015-05-26 14:28:26 -07:00
Alexander Morozov 96fc5c8d8e Merge pull request #13489 from cpuguy83/cleanup_rm_funcs 
Cleanup container rm funcs
Upstream-commit: de318d8c1d980066db8e94825d0529698095536c
Component: engine
 2015-05-26 14:24:02 -07:00
Jessica Frazelle d89704cf56 Revert "Add docker exec run a command in privileged mode" 
This reverts commit 72a500e9e5929b038816d8bd18d462a19e571c99.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
Upstream-commit: 40b71adee390e9c06471b89ed845132b4ec80177
Component: engine
 2015-05-26 14:12:16 -07:00
Arnaud Porterie 5066df6b7c Merge pull request #13440 from LK4D4/fix_bridge_none 
Fix network with -b none
Upstream-commit: 47e727d1fcef00c270851ecc3e5efa7d7b65240d
Component: engine
 2015-05-26 14:08:21 -07:00
Tianon Gravi 966f3309f6 Merge pull request #13409 from LK4D4/add_opts_to_checkconfig 
Add some opts to checkconfig
Upstream-commit: 3b795e035ba39fc31f5df184301994a3dcdced43
Component: engine
 2015-05-26 13:54:23 -06:00
Brian Goff 2b42c2c199 Cleanup container rm funcs 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f8628ba89104385071e811d0b21293d7cd2e8e01
Component: engine
 2015-05-26 15:38:52 -04:00
Derek McGowan 416a489d28 Allow mirroring only for the official index 
Strip authconfig from session to keep credentials from being sent to the mirror.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: c19962ade10619e5edd8057249566c494d4719bb
Component: engine
 2015-05-26 11:08:19 -07:00
Richard 521590a1df Registry v2 mirror support. 
The v2 registry will act as a pull-through cache, and needs to be
handled differently by the client to the v1 registry mirror.

See docker/distribution#459 for details

Configuration

Only one v2 registry can be configured as a mirror. Acceptable configurations
in this chanage are: 0...n v1 mirrors or 1 v2 mirror. A mixture of v1 and v2
mirrors is considered an error.

Pull

If a v2 mirror is configured, all pulls are redirected to that mirror. The
mirror will serve the content locally or attempt a pull from the upstream mirror,
cache it locally, and then serve to the client.

Push

If an image is tagged to a mirror, it will be pushed to the mirror and be
stored locally there. Otherwise, images are pushed to the hub. This is
unchanged behavior.

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
Upstream-commit: 13deed380127d4a0e7982bb0d4f6529d0962116b
Component: engine
 2015-05-26 11:08:19 -07:00
David Calavera 7991258f62 Merge pull request #13479 from Microsoft/10662-fixcontaineragain 
Windows: Fix up container again
Upstream-commit: fc679bebb9546a10c0f0a5b134f63cd58cd38b26
Component: engine
 2015-05-26 10:49:48 -07:00
Arnaud Porterie d1e801b441 Merge pull request #13480 from Microsoft/10662-fixvolumecompile 
Windows: Fix volume_windows compile
Upstream-commit: 7853bd29ec941fe8ee9ff176f0349177d1d54edd
Component: engine
 2015-05-26 10:32:44 -07:00
Jessica Frazelle f13e674ff0 fix lxc tests unshare, they dont use our apparmor profile 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: a08fb73f9387e22b222d90e638b9f512c3295bdb
Component: engine
 2015-05-26 10:31:21 -07:00
John Howard aff149351d Windows: Fix volume_windows compile 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1dc0499b64179e18b902e34d5c97ff72327d9d59
Component: engine
 2015-05-26 09:43:21 -07:00
John Howard a749f0fc90 Windows: Fix up container again 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5d207de5092f4532a1696939fdb64a85d370fb01
Component: engine
 2015-05-26 09:33:55 -07:00
Brian Goff 86ef32192a Merge pull request #13471 from ibuildthecloud/no-nil 
Preinitialize MountPoints to avoid assigning to a nil map
Upstream-commit: 0fccc40307c239e421dde825fc9f7adfadeaff61
Component: engine
 2015-05-26 12:26:49 -04:00
Sebastiaan van Stijn 828fa4725f Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test 
add unshare apparmor profile test
Upstream-commit: aee9ac302d06ebcc56713142245aa19584c8b99f
Component: engine
 2015-05-26 17:32:45 +02:00