Commit Graph
15625 Commits
Author SHA1 Message Date
Sven Dowideit b4bae162cd Merge pull request #13137 from SvenDowideit/need-more-sudo
Need more sudo
Upstream-commit: c49695f976ab97dc8c7a249f5211d9e0fcb2c24c
Component: engine
2015-05-12 09:07:55 +10:00
Sven Dowideit 56b6d8326b Need more sudo
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: c5e93d095005e8b336b845cb94d95f55a594b3ce
Component: engine
2015-05-11 23:07:22 +00:00
John Howard d3339de046 Windows: Don't pull in all of resolvconf
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 78604a9f3fc7d08b39fea0e80dafaa6f8472b050
Component: engine
2015-05-11 15:28:08 -07:00
Sven Dowideit 8422b7afff Merge pull request #13134 from SvenDowideit/dhe-1.0.1-release
DHE 1.0.1 release
Upstream-commit: 34b976953824f5ec0237e6dc2d6c147a0547e992
Component: engine
2015-05-12 07:34:30 +10:00
Sven Dowideit 133eb58df5 DHE 1.0.1 release
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 38af208da1414dad81dbd96d7d8678bfb94f9dc0
Component: engine
2015-05-11 21:23:56 +00: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
Shishir Mahajan 7820b09f20 Missing exec-opt[] option in CommandLine docs
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 98277f3cad55e68aa730ba40cb375b268ee794e6
Component: engine
2015-05-11 15:41:50 -04:00
Michael Crosby a9a448c762 Merge pull request #12994 from Microsoft/10662-fixinvocation
Windows: Fix builder\dispatchers.go
Upstream-commit: e66ad40c4e62d784e23e0df39de0970c5ced3917
Component: engine
2015-05-11 11:24:43 -07: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
Sebastiaan van Stijn 8647686396 Merge pull request #13111 from gianlucaborello/fix-mac-documentation
Correctly document MAC address generation
Upstream-commit: 4d6720bfbb0a2f88d4733ca2a3103e3160d0cd33
Component: engine
2015-05-10 13:43:27 -04:00
Alexander Morozov 240f5e3960 Merge pull request #13102 from duglin/MissingOK
Add missing "ok" on "comma ok" idiom in test util
Upstream-commit: 13064646a64cdc6772fe05ac4445d1498d76656a
Component: engine
2015-05-10 09:22:44 -07: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
Qiang Huang abc1b2f1ff Fix oom kill disable issue
It should not be hard limit, we should only check oom kill disable
when user using it.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a2f39e7754c5ca1245cc268472ecb92147ba21fa
Component: engine
2015-05-10 14:55:00 +08: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
Alexander Morozov ab315ef02f Merge pull request #13093 from tianon/writeflusher
Move WriteFlusher out of utils into ioutils
Upstream-commit: c5710c73185d81909b02c0c2683d6183aeef9e61
Component: engine
2015-05-09 09:39:17 -07:00
Alexander Morozov c55979eeda Merge pull request #13095 from Microsoft/10662-pkgrexec
Windows: reexec pkg supported
Upstream-commit: 61cb6012e6b4085f9c867d826431368bb18896c8
Component: engine
2015-05-09 09:38:42 -07:00
Doug Davis 52da2e9683 Fix RUN err msg (again)
Previous fix used %q which incorrectly go-escaped things. For example:

```
RUN echoo A \& B	C
```
would result in the user seeing:
```
INFO[0000] The command '/bin/sh -c echoo A \\& B\tC' returned a non-zero code: 127
```
Note the double-\ and the \t instead of a tab character

The testcase had to double escape things due to logrus getting in the way
but I'm going to fix that in another PR because its a change to the UX.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 006c066b6ce0b8b16f7d68b0ef997717bfb35662
Component: engine
2015-05-09 09:22:30 -07:00
Doug Davis 104194a4ef Add missing "ok" on "common ok" idiom in test util
w/o this the "ok" we're checking is from the previous type assertion.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: dd4693f67cb0ce5dc14c87ddf2a9a9f6a3406763
Component: engine
2015-05-09 05:56:10 -07:00
Sebastiaan van Stijn 1eea50823f Merge pull request #12180 from Mashimiao/add-cpuperiod-and-cpuquota-support
add cpu.cfs_period_us  support
Upstream-commit: 7699cee247664988868e9cab480e795dbea927cb
Component: engine
2015-05-08 22:32:09 -04: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
John Howard c39c5e2a47 Windows: reexec pkg supported
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 64715c4f33fdb98003b7fda8d1dcf9c65463de07
Component: engine
2015-05-08 14:15:53 -07:00
Brian Goff 20802b8b53 Fix error message on firewalld init
If firewalld is not installed (or I suppose not running), firewalld was
producing an error in the daemon init logs, even though firewalld is not
required for iptables stuff to function.
The firewalld library code was also logging directly to logrus instead
of returning errors.

Moved logging code higher up in the stack and changed firewalld code to
return errors where appropriate.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 38b5c7266a14c34624bba532cb74d8b2ae46c726
Component: engine
2015-05-08 15:51:44 -04:00
John Howard 669b8fe47b Windows: Fix builder\dispatchers.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4d2f6fbde012f6b58345cc21eadcd619db83b292
Component: engine
2015-05-08 11:45:08 -07: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
Tianon Gravi a9af2bce60 Move WriteFlusher out of utils into ioutils
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 223d6de728ac5df5394b4990f81a466c858d519c
Component: engine
2015-05-08 12:33:33 -06:00
Doug Davis 9a0c72b2d1 Fix random errors in DockerSuite.TestNetworkNat
I believe this was failing because 'nc' wouldn't show the data
it received sometimes. So intead of looking for that data we now
look for the output of the echo that comes after the nc command
successfully runs

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 769df832a39e2507fb46cb8896666a1c3197ff0b
Component: engine
2015-05-08 10:59:26 -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
Alexander Morozov aaee340d81 Update github.com/syndtr/gocapability to 66ef2aa7a23ba682594e2b6f74cf40c0692b49fb
It adds List function for listing all supported caps

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 5a2d592c27e93cf7f3d01216cf6e22656330fe84
Component: engine
2015-05-08 09:22:37 -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 01977b40d0 integration: add variable to set storage options for testing
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: 30f3bd643d5f6706bbaa9559e781b036661f149e
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 9c30c1f4a1 docs: move zfs.fsname option to storage option section
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: bdf784ae4ae62a560f28e974ff9b9c26aaf8a533
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
Alexander Morozov 0d41ea39ed Merge pull request #13071 from tianon/explicit-vendor
Update "hack/vendor.sh" to be more explicit
Upstream-commit: 23abd51ef15b2c0138e272708845750be5eb0b03
Component: engine
2015-05-08 08:22:17 -07:00
Brian Goff 450b717836 Merge pull request #13069 from runcom/dry-run-test
API tests - Container create with Hostname, Domainname and Network
Upstream-commit: af9dac9627e7b04a803df152cc24f0db073ea17a
Component: engine
2015-05-07 22:07:41 -04:00
Jessie Frazelle bda12eddfc Merge pull request #12422 from wlan0/logopts
add log opts flag to pass in logging options
Upstream-commit: fe3becee34a93ebffe4a9fbcb0057d2b82242307
Component: engine
2015-05-07 18:10:04 -07:00
Michael Crosby 48cb321d93 Merge pull request #13080 from jfrazelle/fix-tests-where-requires-libcontainerr-security
fix lxc because it doesnt have the hardened libcontainer stuff
Upstream-commit: b94107c4d898e9b91c5940649779ed2129aadbc5
Component: engine
2015-05-07 18:07:27 -07:00
Jessie Frazelle 9b361889f7 Merge pull request #13027 from runcom/fix-typo-reference-remote-api
Fix typo in the api remote reference for links
Upstream-commit: 128a07b512bf119d2cf3ae536e1cb6d19bc0f460
Component: engine
2015-05-07 17:53:21 -07:00