dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-09 09:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,346 Commits 19 Branches 592 Tags
e96d086afdb111fc4b587d4e82c857dbfec4e87e
Commit Graph

3286 Commits

Author SHA1 Message Date
Vincent Demeester
e6aa40a017 Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli 
CLI flag for docker create(run) to change block device size.
 2016-03-29 08:52:54 +02:00
Sebastiaan van Stijn
6114072ffc Merge pull request #21587 from Microsoft/jjh/bridgeconfig 
Windows: bridgeConfig rework
 2016-03-28 18:45:41 -07:00
Michael Crosby
051c5ddadc Merge pull request #21552 from tonistiigi/aufs-mount-locks 
Protect aufs mounts with locks
 2016-03-28 17:00:43 -07:00
David Calavera
be390c30cd Merge pull request #21523 from LK4D4/cancellable_routes 
Embed context.Context to routes with usage of CloseNotify
 2016-03-28 12:44:07 -07:00
John Howard
ff3525c80f Windows: bridgeConfig rework 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-03-28 12:24:01 -07:00
Shishir Mahajan
b16decfccf CLI flag for docker create(run) to change block device size. 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2016-03-28 10:05:18 -04:00
John Howard
59d8878558 Windows: psignal alias not required 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-03-27 17:23:34 -07:00
Tonis Tiigi
824c24e680 Protect aufs mounts with locks 
Parallel aufs mount calls produce invalid argument error.

Fixes #21545


Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-26 22:53:47 -07:00
Robin Naundorf
a1d6c60ee0 Fixes #21538 
typo corrected

Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
 2016-03-26 09:38:00 +01:00
Alexander Morozov
62c9e62edc use router.Cancellable instead of direct CloseNotify 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-25 11:33:54 -07:00
David Calavera
786305ed0c Merge pull request #21486 from Microsoft/jjh/execroot 
Windows: Remove --exec-root
 2016-03-25 11:07:48 -07:00
Vincent Demeester
2de29fb9c2 Merge pull request #21361 from HackToday/addfilter 
Add name/driver filter support for volume
 2016-03-25 08:07:38 +01:00
Sebastiaan van Stijn
f3d824771a Merge pull request #21487 from tonistiigi/fix-old-dind 
Fix setting cgroup permission to user/privileged devices
 2016-03-24 22:56:39 -07:00
Kai Qiang Wu(Kennan)
8e9305ef94 Add name/driver filter support for volume 
This change include filter `name` and `driver`,
and also update related docs to reflect that filters usage.

Closes: #21243

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-03-25 01:11:17 +00:00
Tonis Tiigi
8784bd6fde Fix wrong variable name on blkio resources 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-24 14:16:40 -07:00
Tonis Tiigi
ee61235880 Fix setting cgroup permission to user/privileged devices 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-24 14:16:33 -07:00
Sebastiaan van Stijn
f2847f8ab3 Merge pull request #21315 from hqhq/hq_check_quota 
Add validation for cpu period and quota
 2016-03-24 14:10:48 -07:00
John Howard
77a50ffa59 Windows: Remove --exec-root 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-03-24 11:42:03 -07:00
Vincent Demeester
2b6b2e1af8 Merge pull request #21464 from coolljt0725/cleanup_dot 
Cleanup: remove redundant period
 2016-03-24 18:34:20 +01:00
allencloud
25c9bd81f6 fix typos in daemon_unix.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-03-24 23:57:11 +08:00
Lei Jitang
cb5b8767b6 Cleanup: remove redundant period 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-03-24 08:26:04 -04:00
Brian Goff
55bbea3751 Merge pull request #21454 from anusha-ragunathan/fix_overlay 
Move layer mount refcounts to mountedLayer
 2016-03-23 22:39:38 -04:00
Sebastiaan van Stijn
5ef04b1c6d Merge pull request #21268 from calavera/remove_dockerfile_from_api 
Remove dockerfile dependency from the API.
 2016-03-23 19:34:21 -07:00
Brian Goff
65d79e3e5e Move layer mount refcounts to mountedLayer 
Instead of implementing refcounts at each graphdriver, implement this in
the layer package which is what the engine actually interacts with now.
This means interacting directly with the graphdriver is no longer
explicitly safe with regard to Get/Put calls being refcounted.

In addition, with the containerd, layers may still be mounted after
a daemon restart since we will no longer explicitly kill containers when
we shutdown or startup engine.
Because of this ref counts would need to be repopulated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-23 14:42:52 -07:00
Anusha Ragunathan
57ca2a2101 Fix use of mounted() in overlay. 
Handle error and mounted case separately.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-03-23 14:42:52 -07:00
Tonis Tiigi
e91de9fb9d Revert "Move layer mount refcounts to mountedLayer" 
This reverts commit 563d0711f8.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-23 00:33:02 -07:00
Lei Jitang
f668e36652 Merge pull request #21407 from LK4D4/log_stats_errors 
daemon: log errors from stats calls
 2016-03-23 14:12:12 +08:00
Tõnis Tiigi
92a3ece35a Merge pull request #21107 from cpuguy83/one_ctr_to_rule_them_all 
Move layer mount refcounts to mountedLayer
 2016-03-22 21:19:00 -07:00
Tibor Vass
694b32df51 Merge pull request #21370 from tonistiigi/expose-layer-ids 
Expose RootFS in image inspect
 2016-03-22 20:33:18 -04:00
Tibor Vass
3ce494f48c Merge pull request #21367 from mlaventure/containerd-docs-cleanup 
Remove unneeded references to execDriver
 2016-03-22 19:40:27 -04:00
Alexander Morozov
14e1325656 daemon: log errors from stats calls 
I encountered silent errors ignoring when runc failed to parse pids.max

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-22 14:03:47 -07:00
Tonis Tiigi
14dc4a7158 Expose RootFS in image inspect 
Fixes #20451

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-22 13:49:30 -07:00
Tibor Vass
53d2e5e9d7 Merge pull request #21270 from ehazlett/resource-labels 
Add Label support for Images (build), Networks and Volumes on Creation
 2016-03-22 15:12:33 -04:00
David Calavera
62d4556654 Merge pull request #21383 from estesp/shared-userns-net-ipc 
Allow net and IPC namespaces to be shared when userns=on
 2016-03-22 11:40:12 -07:00
Tibor Vass
de9ff4bdc0 Merge pull request #21223 from cpuguy83/add_nocp_to_vols 
Add explicit flags for volume cp/no-cp
 2016-03-22 13:45:12 -04:00
Evan Hazlett
fc214b4408 add label support for build, networks and volumes 
build: implement --label

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

network: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

volume: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

add tests for build, network, volume

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vendor: libnetwork and engine-api bump

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-03-22 11:49:06 -04:00
Brian Goff
563d0711f8 Move layer mount refcounts to mountedLayer 
Instead of implementing refcounts at each graphdriver, implement this in
the layer package which is what the engine actually interacts with now.
This means interacting directly with the graphdriver is no longer
explicitly safe with regard to Get/Put calls being refcounted.

In addition, with the containerd, layers may still be mounted after
a daemon restart since we will no longer explicitly kill containers when
we shutdown or startup engine.
Because of this ref counts would need to be repopulated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-22 11:36:28 -04:00
Arnaud Porterie
9f327b4c28 Merge pull request #21373 from aaronlehmann/client-user-agent-registry-operations 
Pass upstream client's user agent through to registry on operations beyond pulls
 2016-03-21 21:49:48 -07:00
David Calavera
adc6ed5a10 Merge pull request #21354 from Microsoft/jjh/getpids 
Windows: Minimal docker top implementation
 2016-03-21 19:59:27 -07:00
Phil Estes
2b278f4846 Allow net and IPC namespaces to be shared when userns=on 
Now that the namespace sharing code via runc is vendored with the
containerd changes, we can disable the restrictions on container to
container net and IPC namespace sharing when the daemon has user
namespaces enabled.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2016-03-21 22:20:26 -04:00
Qiang Huang
aae4bcf773 Remove dot in suffix to avoid double dot error message 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-03-22 09:17:54 +08:00
Qiang Huang
b041fdc0d5 Add validation for cpu period and quota 
Accoding to:
https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt

It has minimal and maximal limit.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-03-22 09:17:54 +08:00
Brian Goff
b0ac69b67e Add explicit flags for volume cp/no-cp 
This allows a user to specify explicitly to enable
automatic copying of data from the container path to the volume path.
This does not change the default behavior of automatically copying, but
does allow a user to disable it at runtime.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-21 20:38:44 -04:00
Aaron Lehmann
c44e7a3e63 Pass upstream client's user agent through to registry on operations beyond pulls 
This adds support for the passthrough on build, push, login, and search.

Revamp the integration test to cover these cases and make it more
robust.

Use backticks instead of quoted strings for backslash-heavy string
contstands.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-03-21 14:31:47 -07:00
Arnaud Porterie
278d3962a8 Merge pull request #21306 from mgoelzer/issue20001-nodeps 
Pass upstream client's user agent through to registry on image pulls
 2016-03-21 14:26:59 -07:00
Alexander Morozov
11b4c89087 Merge pull request #21301 from cpuguy83/cleaner_file_log 
Fixes some issues with jsonfile write/read
 2016-03-21 14:03:36 -07:00
Kenfe-Mickael Laventure
8af4f89cba Remove unneeded references to execDriver 
This includes:
 - updating the docs
 - removing dangling variables

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-21 13:06:08 -07:00
Vincent Demeester
d82ad12df8 Merge pull request #19439 from pcarrier/pcarrier/19438-async-connections-to-fluentd 
fluentd logger: support all options besides Unix sockets
 2016-03-21 18:09:14 +01:00
Arnaud Porterie
2a4c970aeb Merge pull request #21342 from tonistiigi/cleanup-libcontainer 
Convert libnetwork stats directly to api types
 2016-03-21 08:54:03 -07:00
David Calavera
be8459c248 Merge pull request #21313 from Microsoft/sjw/logs_fix 
Fixing logs file handle leak.
 2016-03-21 08:41:31 -07:00