docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
14,791 Commits 12 Branches 296 Tags
9fa728d386f452a2bdcaab9cdcdd20418fffec0d
Commit Graph

1253 Commits

Author SHA1 Message Date
Jessie Frazelle
9fa728d386 Merge pull request #12391 from ibuildthecloud/syslog-format 
Change syslog format and facility
Upstream-commit: 2e4d36ed80855375231501983f19616ba0238a84
Component: engine
 2015-04-15 14:47:12 -07:00
Darren Shepherd
78dcc43512 Change syslog format and facility 
This patch changes two things

1. Set facility to LOG_DAEMON
2. Remove ": " from tag so that the tag + pid become a single column in
   the log

Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 05641ccffc5088a382fa3bfb21f1276ccb6c1fc0
Component: engine
 2015-04-15 12:46:43 -07:00
Brian Goff
ab74fc7837 Merge pull request #12387 from x1022as/inspect-logpath 
Inspect show right LogPath in json-file driver
Upstream-commit: f0c60f7085ea124c2d3660fae17c1d2ab7e4abb0
Component: engine
 2015-04-15 14:28:39 -04:00
Brian Goff
79544ae835 Merge pull request #12139 from hqhq/hq_add_cpusest_mems2 
add support for cpuset.mems
Upstream-commit: 2ecccda1628388a6a29a2cd3bb40630f0afe5351
Component: engine
 2015-04-15 13:29:43 -04:00
Jessica Frazelle
72996be1fe try to modprobe bridge 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: b3867b889960604904a4afbab6450bb9528afe06
Component: engine
 2015-04-15 07:19:37 -07:00
Deng Guangxing
e04ea19d11 Inspect show right LogPath in json-file driver 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: acf025ad1b806fd9b5eb3358a8e1d75c6aae890d
Component: engine
 2015-04-15 11:51:24 +08:00
Qiang Huang
4f6ebaa34e add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8077b2fb805c78cee642d8350df88227c6414960
Component: engine
 2015-04-15 09:33:46 +08:00
Phil Estes
c444005c81 Merge pull request #12292 from cpuguy83/remove_commands_integration 
Remove commands integration
Upstream-commit: 2f0f04e8fa32a7f8d02b4a9078537f52887d8ab7
Component: engine
 2015-04-14 16:17:25 -04:00
Jessie Frazelle
61453daea9 Merge pull request #11999 from vbatts/vbatts-decide_storage 
graphdriver: prefer prior driver state
Upstream-commit: 74f4a88305c032365ea2611503d4673bf0b0b880
Component: engine
 2015-04-14 13:04:21 -07:00
Brian Goff
1adac1131b remove integration/utils setRaw funcs 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 63331abbcadee3528f3e03f96cff1ca6a506cc9e
Component: engine
 2015-04-14 15:17:17 -04:00
Phil Estes
07f1e1bf7b Merge pull request #11992 from runcom/11923-refactor-utils-utils 
Refactor utils/utils, fixes #11923
Upstream-commit: fe53c277857ba77caf9189b1d6d095835c1b792c
Component: engine
 2015-04-14 12:01:23 -04:00
Vincent Batts
78acc699c1 graphdriver: prefer prior driver state 
Before this, a storage driver would be defaulted to based on the
priority list, and only print a warning if there is state from other
drivers.

This meant a reordering of priority list would "break" users in an
upgrade of docker, such that there images in the prior driver's state
were now invisible.

With this change, prior state is scanned, and if present that driver is
preferred.

As such, we can reorder the priority list, and after an upgrade,
existing installs with prior drivers can have a contiguous experience,
while fresh installs may default to a driver in the new priority list.

Ref: https://github.com/docker/docker/pull/11962#issuecomment-88274858

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: b68e161e5b76b5f622cf4fc226df46cbe314ea1e
Component: engine
 2015-04-13 21:37:55 -04:00
Megan Kostick
81dfdc7b63 Add detection for F2Fs and JFS 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>

Alphabetize FSMagic list to make more human-readable.

Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: 7e2d05b4938c010bf15224bd2857e2dca92ec9b3
Component: engine
 2015-04-13 17:01:43 -07:00
Antonio Murdaca
a4111cba55 Refactor utils/utils, fixes #11923 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c30a55f14dbbe3971ba0ac716ba69a60868f4490
Component: engine
 2015-04-14 01:37:36 +02:00
Michael Crosby
6165959ea5 Merge pull request #12025 from coolljt0725/add_exec_with_user 
Add docker exec run command as a different user and in privileged mode
Upstream-commit: 12f7db18309950785e873119edb03e0a1621e7a3
Component: engine
 2015-04-13 13:50:51 -07:00
David Calavera
7e81577a52 Log memory swap capabilities properly. 
Check whether the swap limit capabilities are disabled or not only when memory swap is set to greater than 0.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 7523beff41eca212794e902afa1a614b2672e245
Component: engine
 2015-04-13 11:56:59 -07:00
Evan Hazlett
9c2d3bf645 Merge pull request #12340 from crosbymichael/syslog-tags 
move syslog-tag to syslog.New function
Upstream-commit: 82256c2a54ec5b9aa822ab2130439c7f87591c16
Component: engine
 2015-04-13 14:51:00 -04:00
Evan Hazlett
e120033d69 Merge pull request #12275 from LK4D4/pid_host_hell 
Get process list after PID 1 dead
Upstream-commit: 05433a4dabeb7204d6925606549ba79022f506d6
Component: engine
 2015-04-13 14:50:23 -04:00
Evan Hazlett
dadf36eca6 Merge pull request #12293 from hqhq/hq_use_hostconfig 
use hostConfig in verifyDaemonSettings
Upstream-commit: a8e095b243355454d7f8269ad267f2d581fd52ac
Component: engine
 2015-04-13 14:34:35 -04:00
Evan Hazlett
ff2ef2c440 Merge pull request #12300 from johngossman/master 
Added some error messages and tracing to bridge network initialization
Upstream-commit: 3434f64827dc5e69afa7161a9da24a9117e7990a
Component: engine
 2015-04-13 14:32:56 -04:00
Evan Hazlett
97f1b60257 Merge pull request #12301 from ewindisch/https_links 
Use HTTPS links for URLs in READMEs / comments / docs
Upstream-commit: 3509132a6e28caa18003298521c58746f490b57b
Component: engine
 2015-04-13 14:30:53 -04:00
Deng Guangxing
73f3660a47 move syslog-tag to syslog.New function 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4f91a333d5c9d66ce109c36e7261dbfd3382ebbf
Component: engine
 2015-04-13 11:24:18 -07:00
Michael Crosby
5fcbf06557 Merge pull request #12331 from coolljt0725/fix_panic_release_nil_interface 
Fix daemon panic when release a nil network interface
Upstream-commit: 9a0a4ac02f92f9fb21b88b9aeced103a0e5e3c4d
Component: engine
 2015-04-13 10:13:57 -07:00
Michael Crosby
ccda6c3ec6 Merge pull request #12279 from runcom/remove-job-commit 
Remove job from commit
Upstream-commit: 33e83d05813207247ffcd0be0ccf6a6a7ad25b64
Component: engine
 2015-04-13 09:57:54 -07:00
Brian Goff
b802ea45ca Merge pull request #12312 from runcom/remove-job-container-stats 
Remove job from container stats
Upstream-commit: 12eff0c26f9d7fb5f0b1f1cbb975b8892c2dc306
Component: engine
 2015-04-13 11:58:31 -04:00
Brian Goff
0118377dec Merge pull request #12313 from runcom/remove-job-export 
Remove job from export
Upstream-commit: a4f98d32258b8e209ab2702f0d0a092a7ffe15a2
Component: engine
 2015-04-13 11:57:55 -04:00
Alexander Morozov
416e9ff40b Merge pull request #12304 from runcom/remove-job-logs 
Remove job from logs
Upstream-commit: bfb487dc50e3b88b520678a9118bfb95891140cb
Component: engine
 2015-04-13 08:38:46 -07:00
Antonio Murdaca
ebe83bc94c Remove job from export 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6b737752e342e30dd20417b18c92c9b4e1c4f8da
Component: engine
 2015-04-13 15:27:45 +02:00
Lei Jitang
a75ea8c667 Fix daemon panic when release a nil network interface 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 8b3548129220a8c79342a12717d87667927df4c9
Component: engine
 2015-04-13 20:24:10 +08:00
Antonio Murdaca
b2c60bfa72 Remove jobs from stats 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 65a056345cec1b85bd41ed70ee814894709ee6c0
Component: engine
 2015-04-13 08:33:53 +02:00
Antonio Murdaca
b3c5a7d38d Remove job from logs 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 91bfed604959c591a076c2e330cb3ded7443f504
Component: engine
 2015-04-13 08:25:31 +02:00
John Gossman
1c3dec21dc More review feedback addressed 
Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: 80e9f6f83856b8e762f030d5e562f9e9f8d17233
Component: engine
 2015-04-12 16:26:37 -07:00
John Gossman
91af3b1937 Addressed feedback. Will squash after further review 
Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: 4ce19da739ccdb8337c59f841e790255d21c6f50
Component: engine
 2015-04-12 15:49:29 -07:00
Antonio Murdaca
b706b2d562 Remove engine from links 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 7560018541192ebdfe16e39515f9a04b44635d84
Component: engine
 2015-04-12 16:25:10 +02:00
Doug Davis
6b4495dbae Merge pull request #12305 from runcom/remove-job-exec-inspect 
Remove job from execInspect
Upstream-commit: a54fd325e6bd0c5a1c298deef48399fe6e59aa33
Component: engine
 2015-04-12 08:30:38 -04:00
Antonio Murdaca
d05177503f Remove job from stop 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 04cc6c6aa4f8ea656d23268b7bff0136e4fc6c8d
Component: engine
 2015-04-12 00:41:16 +02:00
Antonio Murdaca
62d48e6c18 Remove job from execInspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 621ee1f6a4cbc8ee8758ce77a0cf6215c88f12f7
Component: engine
 2015-04-12 00:15:34 +02:00
John Gossman
aeebc69e43 Added some error messages and tracing to bridge network initialization 
Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: a9843cb739bd30a9e6eeb8841f645008e1fc905f
Component: engine
 2015-04-11 11:15:24 -07:00
Eric Windisch
0551904b7c Link to HTTPS URLs in engine comments 
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: ca37301d54e1525d4522dea266180072d4fd892b
Component: engine
 2015-04-11 13:31:34 -04:00
Qiang Huang
06600b0ef1 use hostConfig in verifyDaemonSettings 
We have moved resource configs to hostConfig.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 39932511c134938233e8bfe4796cec9a1b30d11e
Component: engine
 2015-04-11 16:37:28 +08:00
Lei Jitang
aaaa676179 Add docker exec run a command in privileged mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 72a500e9e5929b038816d8bd18d462a19e571c99
Component: engine
 2015-04-11 11:26:37 +08:00
Lei Jitang
d1f2626097 Add -u|--user flag to docker exec for running command as a different user 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2cce4791b0e75201cb65daad07d4203d1c4c2996
Component: engine
 2015-04-11 11:04:24 +08:00
Deng Guangxing
d555f3e70e 'docker rmi -f IMAGE_ID' untag all names and delete the image 
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:

        *untag all names and delete the image

        *add test to this feature

        *modify commandline/cli.md to explain this

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 795a58fb44a2bd18ec37d78c82d75c025f786c50
Component: engine
 2015-04-11 09:24:21 +08:00
Alexander Morozov
5dd956e210 Get process list after PID 1 dead 
Fix #11087

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ac8bd12b39d39a9361adc174bdff7837e771460d
Component: engine
 2015-04-10 16:23:57 -07:00
Antonio Murdaca
e41d53c507 Remove job from commit 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c8529fde5f6f2e4b62f9c1b3382fd814c11a7639
Component: engine
 2015-04-11 00:20:45 +02:00
Tibor Vass
44fddcaf4b Merge pull request #11412 from vbatts/vbatts-dm_sync_is_required 
devmapper: udev sync is a requirement
Upstream-commit: 23c12dabbdb7f895f606bbf2438599d29c53df3a
Component: engine
 2015-04-10 16:52:38 -04:00
Vincent Batts
d89c51c3b5 devmapper: storage-opt override for udev sync 
This provides an override for forcing the daemon to still attempt
running the devicemapper driver even when udev sync is not supported.

Intended to be a very clear impairment for those choosing to use it. If
udev sync is false, there will still be an error in the daemon logs,
even when the override is in place. The docs have an explicit WARNING.

Including link to the docs for users that encounter this daemon error
during an upgrade.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 0e21782de5c038dfa3cfdfc7655b9e6b143baa7b
Component: engine
 2015-04-10 15:43:16 -04:00
Antonio Murdaca
928371a2db Remove job from wait 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: db0ffba3b92aeda667501aaa10926943a7738f82
Component: engine
 2015-04-10 20:17:02 +02:00
Michael Crosby
1f992e6c96 Merge pull request #12259 from duglin/RemoveJobTop 
Remove Job from `docker top`
Upstream-commit: bae3273ef4e61fd04c0dd4ddb1527aa7c4f9bfb6
Component: engine
 2015-04-10 10:56:01 -07:00
Michael Crosby
ff94291067 Merge pull request #12248 from duglin/RemoveJobKill 
Remove Job from `docker kill`
Upstream-commit: 267bd51adbf9e344a5d18bb0c7df4e09bcb60668
Component: engine
 2015-04-10 10:52:18 -07:00