starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-11 02:24:27 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,476 Commits 13 Branches 322 Tags
792a1ace8aed823b60ea764763f029379f2cbc51
Commit Graph
1417 Commits
Author SHA1 Message Date
Brian Goff 792a1ace8a Make sure log pipes are closed 
Pipes are still not closed (and goroutines leaked) if neither pipe is
used.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e3ba3dd5b828307c3970d0036b019eca405e4a2c
Component: engine
 2015-05-12 13:50:51 -04:00
Alexander Morozov baa93a3d54 Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup 
Refactor server to use the daemon as a service
Upstream-commit: 3b13e56fd7c6542ae535d83c12939c46bd40e2ad
Component: engine
 2015-05-12 10:27:43 -07:00
Sebastiaan van Stijn b60e82567d Merge pull request #12362 from ahmetalpbalkan/logs/since 
Add --since argument to docker logs cmd
Upstream-commit: d0459abe6e29548c6df045483f08797840620b0a
Component: engine
 2015-05-12 09:40:16 -04:00
Sebastiaan van Stijn 6a33f440dd Merge pull request #10786 from estesp/add-goroutine-debug 
Add capability for goroutine dumping on SIGQUIT/USR1
Upstream-commit: a5007e5737fac5904b61f49c8a7fd6fc29f83330
Component: engine
 2015-05-11 21:20:44 -04:00
Phil Estes c0e7d1e48e Add SIGUSR1 handler for dumping stack/goroutine traces 
Add handler for SIGUSR1 based on feedback regarding when to dump
goroutine stacks.  This will also dump goroutine stack traces on SIGQUIT
followed by a hard-exit from the daemon.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 95fcf76cc64a4acf95c168e8d8607e3acf405c13
Component: engine
 2015-05-12 10:09:23 +10:00
Tibor Vass 5a91f639c0 Merge pull request #9411 from Mic92/features/zfs-rebased 
zfs-utils based zfs graph driver
Upstream-commit: e7568ed227908c3470b6a341ed24c05ca486368d
Component: engine
 2015-05-11 16:53:17 -07:00
Jessie Frazelle 478cbff61d Merge pull request #13132 from LK4D4/fix_race_kill 
Fix race between execdriver.Kill and execdriver.Run
Upstream-commit: a47fb5edca77536ea6ea024df0bc15978d172224
Component: engine
 2015-05-11 14:01:07 -07:00
Alexander Morozov c578ab5fb7 Fix race between execdriver.Kill and execdriver.Run 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ca7219f5daa194ae714c3a3396703e08d8a137c8
Component: engine
 2015-05-11 13:23:50 -07:00
Jessie Frazelle 84543fc3ec Merge pull request #13074 from runcom/11824-short-link-if-equals-alias 
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
 2015-05-11 13:18:29 -07:00
Antonio Murdaca 60d5f903de Allow links to be specified with only the name if this matches the alias 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
 2015-05-11 21:50:47 +02:00
Antonio Murdaca 12071c528f Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e2acca67c8e089429c8a5d5171887e5de42e3917
Component: engine
 2015-05-11 19:56:41 +02:00
Alexander Morozov ceedb9d4b8 Merge pull request #13101 from bharaththiruveedula/13092-remove-unwanted-locks 
Removing extra locks for Pause and Unpause functions
Upstream-commit: 5e063326a345349b406791a6822f6423e17c353d
Component: engine
 2015-05-11 10:54:39 -07:00
Jessie Frazelle 203bb4326e Merge pull request #13091 from LK4D4/generate_caps 
Generate caps
Upstream-commit: 92344602eadd6500f9936593772e46cf7db2b518
Component: engine
 2015-05-11 10:42:59 -07:00
Ahmet Alp Balkan 365c18080f Add --since argument to docker logs cmd 
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.

Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
 2015-05-10 20:42:14 +00:00
Gianluca Borello 9784ed801a Default MAC address generation is not random and should be stated in the documentation. 
Signed-off-by: Gianluca Borello <g.borello@gmail.com>
Upstream-commit: e324f51e5b7bf9d28701af97bdb9fcdc26fc7699
Component: engine
 2015-05-10 08:11:26 -07:00
Bharath Thiruveedula fc89bcb4ca Removing extra locks for Pause and Unpause functions 
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
Upstream-commit: 8c1ef5ceafcba2476693db7f5db39300ad2e7f88
Component: engine
 2015-05-10 00:16:54 +05:30
Alexander Morozov a40ebffc52 Merge pull request #12988 from Mashimiao/remove-unused-container-functions 
cleanup: remove unneeded locks
Upstream-commit: 340fd140e67901c8b5ad9d59c6fb693f6bbcffde
Component: engine
 2015-05-09 09:42:27 -07:00
Ma Shimiao 87d85e4c09 cleanup remove unneeded locks 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: bcc24ec8ad26ebb3564eb462fd80654964ff4651
Component: engine
 2015-05-09 10:06:53 +08:00
Ma Shimiao 560ba9b809 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
 2015-05-09 10:02:46 +08:00
Michael Crosby 9906aa5fe1 Merge pull request #12978 from Microsoft/10662-containerexeccreate 
Windows: Split ContainerExecCreate
Upstream-commit: 3697dddc0d913d0d4468a1570408390a336d8b7b
Component: engine
 2015-05-08 11:38:03 -07:00
Alexander Morozov 11ef87f883 Generate capabilityList automatically 
Generation based on CAP_LAST_CAP, I hardcoded
capability.CAP_BLOCK_SUSPEND as last for systems which has no
/proc/sys/kernel/cap_last_cap

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a559c1145af3162cd683866fd6f998ff5f57058f
Component: engine
 2015-05-08 09:40:05 -07:00
Jörg Thalheim 30e28d31e0 zfs: retrieve all filesystems on startup at once 
The docker graph call driver.Exists() on initialisation for each filesystem in
the graph. This results will results in a lot `zfs get all` commands. To reduce
this, retrieve all descend filesystem at startup and cache it for later checks

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: bad25ccf978b56da6fa181439504ab33906524cd
Component: engine
 2015-05-08 17:49:39 +02:00
Jörg Thalheim f9c00c527b zfs: improve performance by using legacy mounts 
instead of let zfs automaticly mount datasets, mount them on demand using mount(2).
This speed up this graph driver in 2 ways:
- less zfs processes needed to start a container
- /proc/mounts get smaller, so zfs userspace tools has less to read (which can
  a significant amount of data as the number of layer grows)

This ways it can be also ensured that the correct mountpoint is always used.

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: 11e9167a6b45fdc134ee43e89abefd34a85cf624
Component: engine
 2015-05-08 17:49:39 +02:00
Jörg Thalheim d9d6332c5d zfs: replace c for /proc/mounts parsing with go 
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: ee00f07ea64074e8abf7d741eed8a83da4e4b5ff
Component: engine
 2015-05-08 17:49:39 +02:00
Jörg Thalheim 2ed25719ce zfs: refactor error handling 
thanks to @calavera

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: dd614b5e34bc82c6921c44619532f2467ce43baa
Component: engine
 2015-05-08 17:48:20 +02:00
Jörg Thalheim 59b313c381 zfs: add myself to MAINTAINERS 
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: a25195d86cb54cbad0bfe840267beaa9f0a84c74
Component: engine
 2015-05-08 17:48:20 +02:00
Jörg Thalheim 289cc2a20f zfs: revert to NaiveGraphDriver for the moment 
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: bacecabf3be2d6b180cbe8fc37ff90f79138bb6e
Component: engine
 2015-05-08 17:48:20 +02:00
Jörg Thalheim e5820ed7e4 Implement Docker on ZFS 
Signed-off-by: Arthur Gautier <baloo@gandi.net>
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: d5151ca8ab5d90300839c8572cb96577de4d6233
Component: engine
 2015-05-08 17:48:20 +02:00
jhowardmsft 8b7803021e Windows: Split ContainerExecCreate 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e35b025aa61e7d8db04a9973967b7109f742593a
Component: engine
 2015-05-06 16:19:27 -07:00
wlan0 0a78638a6e Add log opts flag to pass in logging options 
Signed-off-by: wlan0 <sidharthamn@gmail.com>
Upstream-commit: dca9e02b15a3757272c90ec4cf0cc2b052a25fe3
Component: engine
 2015-05-04 14:39:48 -07:00
Jessie Frazelle 92cec4b2c1 Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode 
add support --net=container with --mac-address, --add-host error out
Upstream-commit: 6b6a26c7697978bf7d43fec11d14ef6ee7e3e4d6
Component: engine
 2015-05-07 17:13:32 -07:00
Jessie Frazelle 5c2686119c Merge pull request #11802 from hqhq/hq_add_blkio_weight 
add blkio.weight support
Upstream-commit: de32f5c431bbdb56d6a446af0e5660fae9539bd8
Component: engine
 2015-05-07 17:10:39 -07:00
Jessie Frazelle 9fb1f7589d Merge pull request #12175 from dqminh/fix-allocate-port 
#12148: sort ports mapping before allocating
Upstream-commit: e03ac8d5b98f525c3d32bb5a6ac84b2c5717a0dc
Component: engine
 2015-05-07 17:04:20 -07:00
Jessie Frazelle 13d096f3f5 Merge pull request #12830 from Microsoft/10662-refactorforwindowsexecdriver 
Windows: Fork execdrivers.go for Windows execdriver
Upstream-commit: 67c10e762e1227c845e098af83afe5a8faaaf8c3
Component: engine
 2015-05-07 16:57:59 -07:00
Jessie Frazelle 1d2b89b8ee Merge pull request #13062 from Microsoft/10662-nativedriver 
Fix os.MkdirAll in native driver
Upstream-commit: b4dc101d746e657ab84547ae28d41d86fb6e4d34
Component: engine
 2015-05-07 16:34:31 -07:00
David Calavera 082fee9c80 Merge pull request #13073 from jfrazelle/add_1.6.1_commits 
Add 1.6.1 commits
Upstream-commit: 23193efd930a77b4e2f9cc01bcd382bf92798c5a
Component: engine
 2015-05-07 16:17:53 -07:00
Jessie Frazelle 78169f4021 Merge pull request #13041 from hqhq/hq_fix_checkkernel 
update recommended kernel in checkKernel
Upstream-commit: 1efecc4c41804e6019b4d4eac17f8f386e9ee658
Component: engine
 2015-05-07 16:15:12 -07:00
Michael CrosbyandJessica Frazelle ac6f208e83 Allow libcontainer to eval symlink destination 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Add tests for mounting into /proc and /sys

These two locations should be prohibited from mounting volumes into
those destinations.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f25bbedc85e8a99c1389dbe8f48436907ce24526
Component: engine
 2015-05-07 14:43:39 -07:00
Michael CrosbyandJessica Frazelle c87ab46f22 Mask reads from timer_stats and latency_stats 
These files in /proc should not be able to be read as well
as written to.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a7a51306b1459a67da3a9cbbe8c9f80d3950c084
Component: engine
 2015-05-07 14:42:23 -07:00
Michael CrosbyandJessica Frazelle 54739fa6d1 Mount RO for timer_stats and latency_stats in proc 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 27ae108b4eda48a621afc5bf2157ef11c314a858
Component: engine
 2015-05-07 14:42:23 -07:00
Michael CrosbyandJessica Frazelle f9ca327070 Mount /proc/fs as readonly 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 42c8c1b0b884c91efa518568181d276afd9d866f
Component: engine
 2015-05-07 14:42:23 -07:00
Michael CrosbyandJessica Frazelle 50f626562d Prevent write access to /proc/asound 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	integration-cli/docker_cli_run_test.go
Upstream-commit: d87da59c79eabb794087f731d3ad51ea98f7a3cc
Component: engine
 2015-05-07 14:42:23 -07:00
Jessie Frazelle 2ee6387cbc Merge pull request #12165 from icecrime/optional_userland_proxy 
Optional userland proxy
Upstream-commit: 74bfa3675353aaf10ca760e82a79d758bea0ff6b
Component: engine
 2015-05-07 14:01:16 -07:00
Alexander Morozov cba2f6d1b5 Merge pull request #13067 from burke/faster-commit-for-overlay 
overlay: skip superfluous metadata sets on commit
Upstream-commit: 93536cfa76fe57b8bc319c747596be935b385871
Component: engine
 2015-05-07 13:58:46 -07:00
Burke Libbey 0b0c4b0dfa overlay: skip superfluous metadata sets on commit 
Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
Upstream-commit: bc5503f46bdc0816d90d99bd516afaa81717346a
Component: engine
 2015-05-07 16:15:54 -04:00
John Howard 91089ecbb8 Fix os.MkdirAll in native driver 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 390f3c99d3a6fd5e9802a675a7c1618d40e3af26
Component: engine
 2015-05-07 12:09:30 -07:00
Alexander Morozov aae3d1533f Merge pull request #12966 from cpuguy83/cleanup_the_lxc_cleanup 
Cleanup container reg for lxc special case
Upstream-commit: 3d2cd92b2d7229b2088f2f03ed46cf039361a6f6
Component: engine
 2015-05-07 10:19:46 -07:00
David Calavera 7d4cfe310d Merge pull request #12965 from tianon/libcontainer-logrus 
Update libcontainer and make it the source of truth on logrus version
Upstream-commit: db26564864f5ef1f2402792ad8dd22bb62b3570c
Component: engine
 2015-05-07 10:10:28 -07:00
Qiang Huang 4f3515319b add blkio.weight support 
We can use this to control block IO weight of a container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f133f11a7d25e6262558dd733afaa95ddd1c7aee
Component: engine
 2015-05-07 11:55:58 +08:00
Brian Goff f36df344d5 Cleanup container reg for lxc special case 
The lxc code here is doing the exact same thing on calling
execdriver.Terminate, so let's just use that.

Also removes some dead comments originally introduced
50144aeb42283848db730b936d6b5b6332ec6565 but no longer relevant since we
have restart policies.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 44cd599e29451647492b3a5341ba23252a69ca27
Component: engine
 2015-05-06 23:01:46 -04:00