David Calavera
f07bb00458
Merge pull request #18780 from jfrazelle/seccomp-default
...
set default seccomp profile
Upstream-commit: 78ce43bad85fdf97d7c836315e46b531901c8ae7
Component: engine
2015-12-28 16:46:30 -08:00
David Calavera
4bf36f597c
Merge pull request #18905 from coolljt0725/fix_disconnect_not_save
...
Fix network disconnect does not save the config to disk
Upstream-commit: 1d4306d2fa73506ed101cd085fea3174a3edda8b
Component: engine
2015-12-28 12:38:16 -08:00
Arnaud Porterie
3849375325
Merge pull request #18715 from calavera/remove_is_paused_from_interface
...
Remove `IsPaused` from backend interface.
Upstream-commit: baee7ae045019d33e6833043bbf86bd76e1b9d41
Component: engine
2015-12-28 11:25:11 -08:00
Jessica Frazelle
3f03a2c89c
add docs and unconfined to run a container without the default seccomp profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 15674c5fb74df00d7560fb35619a5372ea2ee74e
Component: engine
2015-12-28 10:26:51 -08:00
Jessica Frazelle
b5ffb5a2c4
set default seccomp profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 947293a28084cb5ee2e10e4d128c6e2b9d9da89d
Component: engine
2015-12-28 10:18:47 -08:00
David Calavera
3ae3fdb79c
Merge pull request #15078 from hqhq/hq_add_set_api_v2
...
Implement docker update command
Upstream-commit: 8669ea01ba93139a51783ac17658dedd47538b9c
Component: engine
2015-12-28 08:55:32 -08:00
Qiang Huang
c4af30652d
Implemet docker update command
...
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 8799c4fc0feadede6ae60e77bd7d9dfd7cc72a79
Component: engine
2015-12-28 19:19:26 +08:00
Shijiang Wei
3ad8eda6ea
ingnore the NotExist error when removing inexistent files
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: de7f6cf16be659cca9217ece6e5dc1221706d504
Component: engine
2015-12-25 15:19:48 +08:00
Lei Jitang
89492a4249
Fix network disconnect does not save the config to disk
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c0bde4e92c1da26e206bfbcb8308bd9a5f037659
Component: engine
2015-12-25 02:09:37 -05:00
Brian Goff
70ad786bca
Merge pull request #18834 from dmcgowan/layerstore-refactor-rw-layer
...
Layerstore refactor rw layer
Upstream-commit: d08ac6e256933b50dc956abddac6d1fd5c750bf9
Component: engine
2015-12-24 08:02:15 -05:00
Derek McGowan
df32f2591a
Revert create return parameter removal
...
Cleanup does not happen if retErr is not set on return
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 54f8ba7e9e496ae58c15eddb084fbd51418ab197
Component: engine
2015-12-23 11:21:02 -08:00
Derek McGowan
3b1545d1b1
Fix race condition between container register and mount
...
When a container is created it is registered before the mount is created. This can lead to mount does not exist errors when inspecting between create and mount.
Fixes #18753
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: d8e090669ed4d9b27206d7f8797c01ed4b2cd20f
Component: engine
2015-12-23 11:20:51 -08:00
Derek McGowan
64820f351d
Refactor RWLayer to use referenced object instead of string
...
RWLayer will now have more operations and be protected through a referenced type rather than always looked up by string in the layer store.
Separates creation of RWLayer (write capture layer) from mounting of the layer.
This allows mount labels to be applied after creation and allowing RWLayer objects to have the same lifespan as a container without performance regressions from requiring mount.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: d04fa49a0dec89d2f71a813ce8eaa182184139c5
Component: engine
2015-12-23 11:19:17 -08:00
Daniel Nephin
1cfbdcfe91
Remove package pkg/ulimit, use go-units instead.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 83237aab2b9430a88790467867505cc9a5147f3e
Component: engine
2015-12-23 13:27:58 -05:00
Daniel Nephin
b109cc7bb5
Move ulimit options to runconfig opts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5adbea7075b2fda6ea9947d131aaa2a5db0c1295
Component: engine
2015-12-23 13:27:58 -05:00
Zhang Wei
6f10e6b229
Add filter for network ls to hide predefined net
...
Add filter support for `network ls` to hide predefined network,
then user can use "docker network rm `docker network ls -f type=custom`"
to delete a bundle of userdefined networks.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 26dd026bd70c9c18a16b0e339821c309e56d8ff0
Component: engine
2015-12-23 13:26:40 +08:00
Sebastiaan van Stijn
f88ae3fe07
Merge pull request #18860 from dnephin/remove_migrate_if_downlevel
...
Remove migrateIfDownlevel and aufs migration from docker pre-0.7
Upstream-commit: 1105caa7f10ae1fa775670256fa7d4ca9d44e4dd
Component: engine
2015-12-23 00:08:36 +01:00
David Calavera
13048f0ce1
Merge pull request #18831 from calavera/test_event_observer
...
Extract event processing to a common function for testing.
Upstream-commit: eacedcbe21e15f396ea1d9f620047718cce03df7
Component: engine
2015-12-22 15:04:32 -08:00
David Calavera
dadaf8ff90
Extract event processing to a common function for testing.
...
We keep only one logic to test event related behavior that will help us
diagnose flacky event errors.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: af51df20bdd9962b1aaa79819cafefc715290d28
Component: engine
2015-12-22 17:10:06 -05:00
Daniel Nephin
b064975176
Remove migrateIfDownlevel and aufs migration from docker pre-0.7
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0673361ef6a0439b79239efb000574ae991b84f7
Component: engine
2015-12-22 16:45:42 -05:00
David Calavera
027f002cb3
Move Config and HostConfig from runconfig to types/container.
...
- Make the API client library completely standalone.
- Move windows partition isolation detection to the client, so the
driver doesn't use external types.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7ac4232e70fe7cf7318333cd0890db7f95663079
Component: engine
2015-12-22 13:34:30 -05:00
David Calavera
f1f019f89d
Move ExecConfig to types.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 839f73c3028629ac1dde6617d6466b98f2bde416
Component: engine
2015-12-22 13:31:46 -05:00
David Calavera
b006691148
Replace usage of pkg/nat with go-connections/nat.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 056e7449039af522fa0a1567ef67916eaa0de93e
Component: engine
2015-12-22 13:31:46 -05:00
David Calavera
3b25d376dd
Move blkiodev package to types.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0aab83d996f645a2e1e28b1e2c03b530c13a5fc1
Component: engine
2015-12-22 13:31:46 -05:00
David Calavera
7e8fcbf740
Move StrSlice to types.
...
This is a very docker concept that nobody elses need.
We only maintain it to keep the API backwards compatible.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: f9b857a200696b07b67e6a7f94ede32487f5649d
Component: engine
2015-12-22 13:31:43 -05:00
Qiang Huang
885ff722b9
Move OomKillDisable to resource
...
1. It's a cgroup api, fit the general defination that we take
cgroup options as kind of resource options.
2. It's common usage and very helpful as explained here:
https://github.com/docker/docker/pull/18270#issuecomment-160561316
3. It's already in `Resource` struct in
daemon/execdriver/driver_unix.go
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 8498ed73f7b35da807b5d5dcf532114c7b3df52d
Component: engine
2015-12-22 16:08:04 +08:00
Sebastiaan van Stijn
161c03c6c1
Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops
...
Add support for blkio read/write iops device
Upstream-commit: 312c82677bdc86d50b483d642ad8c61f1c840c55
Component: engine
2015-12-21 23:45:18 +01:00
David Calavera
9e1ab087f5
Remove IsPaused from backend interface.
...
Move connection hijacking logic to the daemon.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: af94f941df9ee43b61e0e8f9d3c3b3962597eff6
Component: engine
2015-12-21 12:34:21 -05:00
Ma Shimiao
a04e1f9592
Add support for blkio read/write iops device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 843084b08b521a70baf9284ec4e23e941ab38367
Component: engine
2015-12-21 09:14:49 +08:00
David Calavera
4b736dc17f
Merge pull request #18651 from vbatts/dm-cleanup
...
loopback (and devicemapper) cleanup
Upstream-commit: 54f945994a0eb79c43c8c34fc77625dc56c0c421
Component: engine
2015-12-18 15:13:28 -08:00
Vincent Demeester
3a6aede7f5
Merge pull request #18721 from tiborvass/remove-dependencies-from-builder
...
Remove image and daemon dependencies from builder
Upstream-commit: 64d70de0a2aa29f565336e896b76c23c879a9a98
Component: engine
2015-12-18 17:19:55 +01:00
Phil Estes
dcc6022170
Merge pull request #18561 from hqhq/hq_adapt_at_start
...
Adapt container settings when start
Upstream-commit: 1ca6690b4fbef191d242265c813cc1a4dd8ece25
Component: engine
2015-12-18 11:07:43 -05:00
Vincent Batts
8b5a2050f9
loopback: separate loop logic from devicemapper
...
The loopback logic is not technically exclusive to the devicemapper
driver. This reorganizes the code such that the loopback code is usable
outside of the devicemapper package and driver.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: af597527121c0ad973e9d0ae4f9cf970da1513cc
Component: engine
2015-12-18 10:57:43 -05:00
Doug Davis
c737574605
Merge pull request #18759 from mikedanese/doc-fix
...
daemon/logger: fix typo in godoc
Upstream-commit: 6bf8844f1179108b9fabd271a655bf9eaaf1ee8c
Component: engine
2015-12-17 19:26:41 -05:00
Mike Danese
f814dbe783
daemon/logger: fix typo in godoc
...
Signed-off-by: Mike Danese <mikedanese@google.com >
Upstream-commit: 881a30c707141b06af0cc7a076b62ff338615f2b
Component: engine
2015-12-17 15:52:33 -08:00
Jess Frazelle
5eac08b5e9
Merge pull request #18395 from LK4D4/default_cgroup_is_not_daemon
...
Use /docker as cgroup parent instead of docker
Upstream-commit: ff69b23dc09e544fb8ae9dccbd1f7992d2005b70
Component: engine
2015-12-17 13:59:00 -08:00
Tibor Vass
1f6b8ad3e8
builder: remove daemon dependency in ContainerAttach
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: b0d947615335fe115b5b93c0c09912a4888e5b29
Component: engine
2015-12-17 16:57:08 +01:00
Tibor Vass
49f762b669
builder: remove daemon dependency in ContainerCreate()
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 03a170c48d660be72c387f1821ca48a713dd1cea
Component: engine
2015-12-17 16:57:08 +01:00
Vincent Demeester
9a50c6c5f4
Merge pull request #18559 from ahmetalpbalkan/return-container-networks
...
Proposal: Add container networks list to /containers/json
Upstream-commit: 0f749ad55ab794872e601b4f665b07c0be07abfc
Component: engine
2015-12-17 10:11:18 +01:00
Tibor Vass
59f83ab1fb
Merge pull request #18586 from tonistiigi/tag-reference-squashed
...
Improve reference validation
Upstream-commit: dc81c2503163025ec5835cf11c53164a437bad6c
Component: engine
2015-12-16 23:08:02 +01:00
David Calavera
fb460ee943
Merge pull request #18717 from anusha-ragunathan/rm-mount-bld-iface
...
Remove Mount/Unmount from Builder interface.
Upstream-commit: e21d06a972b0edb44030db72b35e4882f05082e4
Component: engine
2015-12-16 13:34:06 -08:00
Brian Goff
bc3565cc24
Merge pull request #18695 from dnephin/move_parse_link
...
Move ParseLink and validators into runconfig.parse where they are used
Upstream-commit: 3805c2909948c3827f242b1a8843320bddde9796
Component: engine
2015-12-16 16:15:52 -05:00
Tonis Tiigi
31f577ea49
Clean up reference type switches
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: eeb2d4c1adbe4e00f9fbcdc70f9ac31997968e1d
Component: engine
2015-12-16 11:58:53 -08:00
Tonis Tiigi
9b8bb0d4e1
Update Named reference with validation of conversions
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ffded61dad76e4c6530359d879afe83907e409a7
Component: engine
2015-12-16 11:58:52 -08:00
Tonis Tiigi
020b74d545
Add own reference package wrapper
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2655954c2dd9d92c2394b04e4262543174c4c038
Component: engine
2015-12-16 11:58:52 -08:00
Vincent Batts
2d549dabbf
Merge pull request #18686 from cpuguy83/fix_btrfs_subvol_delete_panic
...
Fix btrfs recursive btrfs subvol delete
Upstream-commit: f57d56350ecf02a88f38219f55cbc42c1a9e07b5
Component: engine
2015-12-16 14:26:40 -05:00
Daniel Nephin
f8a7e2bc3a
Move ParseLink and validators into runconfig.parse where they are used.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 233a4fc33ccaf279cc5a0ad1842ef5b053cccde7
Component: engine
2015-12-16 14:22:54 -05:00
David Calavera
4738f86f62
Merge pull request #18682 from calavera/replace_units_package
...
Replace pkg/units with docker/go-units.
Upstream-commit: b44b5bbc8ba48f50343602a21e7d44c017c1e23d
Component: engine
2015-12-16 10:48:59 -08:00
Tibor Vass
2723fcf0b2
builder: remove dependency on image
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 9be1ec60d4d4fe63d5ef6e1ec36c585b548a00d0
Component: engine
2015-12-16 19:25:03 +01:00
Brian Goff
e98aacbdae
Merge pull request #18705 from runcom/cleanups
...
Cleanups
Upstream-commit: ebb1d56ecb21ff9833159a52766561bb82be285b
Component: engine
2015-12-16 12:40:31 -05:00