docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
23,347 Commits 12 Branches 296 Tags
04b0094596c2f7dab4b4a43f9ffe7162715744ba
Commit Graph

3286 Commits

Author SHA1 Message Date
Vincent Demeester
57e1cc77d5 Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli 
CLI flag for docker create(run) to change block device size.
Upstream-commit: e6aa40a017e0c11186fb9053b9e71e34b93ebe1c
Component: engine
 2016-03-29 08:52:54 +02:00
Sebastiaan van Stijn
46aef12c44 Merge pull request #21587 from Microsoft/jjh/bridgeconfig 
Windows: bridgeConfig rework
Upstream-commit: 6114072ffc78adda9888b31c70b95e73a8ea3c2e
Component: engine
 2016-03-28 18:45:41 -07:00
Michael Crosby
93a9ef306c Merge pull request #21552 from tonistiigi/aufs-mount-locks 
Protect aufs mounts with locks
Upstream-commit: 051c5ddadc17ffb8a0f9923df0f0b2206ae0eba9
Component: engine
 2016-03-28 17:00:43 -07:00
David Calavera
1660794bad Merge pull request #21523 from LK4D4/cancellable_routes 
Embed context.Context to routes with usage of CloseNotify
Upstream-commit: be390c30cdde978ea1a5417875876e4f3ae52655
Component: engine
 2016-03-28 12:44:07 -07:00
John Howard
701bd59680 Windows: bridgeConfig rework 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ff3525c80f9118e2320e480dde75887c50d6ac0a
Component: engine
 2016-03-28 12:24:01 -07:00
Shishir Mahajan
9ab7e4327f CLI flag for docker create(run) to change block device size. 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: b16decfccfdb0749c490be9272cb7b4789be87b4
Component: engine
 2016-03-28 10:05:18 -04:00
John Howard
379ab3cb40 Windows: psignal alias not required 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 59d8878558f97055d8abb1fa347df437cf8f90aa
Component: engine
 2016-03-27 17:23:34 -07:00
Tonis Tiigi
a119fb7401 Protect aufs mounts with locks 
Parallel aufs mount calls produce invalid argument error.

Fixes #21545


Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 824c24e6802ad3ed7e26b4f16e5ae81869b98185
Component: engine
 2016-03-26 22:53:47 -07:00
Robin Naundorf
0d92595efc Fixes #21538 
typo corrected

Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
Upstream-commit: a1d6c60ee094e12b7373cc86b78d89ba0a3e5090
Component: engine
 2016-03-26 09:38:00 +01:00
Alexander Morozov
4948749e40 use router.Cancellable instead of direct CloseNotify 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 62c9e62edcf3d96d251fd06a48437b2fa2f56ad6
Component: engine
 2016-03-25 11:33:54 -07:00
David Calavera
2803dd9564 Merge pull request #21486 from Microsoft/jjh/execroot 
Windows: Remove --exec-root
Upstream-commit: 786305ed0cd8f9b8b8a66b6b77907b2f8635e95b
Component: engine
 2016-03-25 11:07:48 -07:00
Vincent Demeester
cfeb820c82 Merge pull request #21361 from HackToday/addfilter 
Add name/driver filter support for volume
Upstream-commit: 2de29fb9c2eaee803d69625a7105953da941356e
Component: engine
 2016-03-25 08:07:38 +01:00
Sebastiaan van Stijn
9a2a79217f Merge pull request #21487 from tonistiigi/fix-old-dind 
Fix setting cgroup permission to user/privileged devices
Upstream-commit: f3d824771a10a8143ea97afb6864d0a587c7b7e3
Component: engine
 2016-03-24 22:56:39 -07:00
Kai Qiang Wu(Kennan)
553d05c397 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>
Upstream-commit: 8e9305ef946843ce2f8ef47909d6a866eab5dfa8
Component: engine
 2016-03-25 01:11:17 +00:00
Tonis Tiigi
88d26b09ba Fix wrong variable name on blkio resources 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8784bd6fdeb7bd87fcbbdee884d42d1dca0c4cca
Component: engine
 2016-03-24 14:16:40 -07:00
Tonis Tiigi
5b031241b0 Fix setting cgroup permission to user/privileged devices 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ee6123588067eb067ec1c02cc340d7493c8cd9a6
Component: engine
 2016-03-24 14:16:33 -07:00
Sebastiaan van Stijn
ee44cd51fb Merge pull request #21315 from hqhq/hq_check_quota 
Add validation for cpu period and quota
Upstream-commit: f2847f8ab3467b43eccf0a9580d4ea3e8abdf146
Component: engine
 2016-03-24 14:10:48 -07:00
John Howard
a2fa8e07dd Windows: Remove --exec-root 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 77a50ffa59c5ba0e22d754fad4cded57efb84e37
Component: engine
 2016-03-24 11:42:03 -07:00
Vincent Demeester
1a8e9b8519 Merge pull request #21464 from coolljt0725/cleanup_dot 
Cleanup: remove redundant period
Upstream-commit: 2b6b2e1af853d465d22f5a57e71aea89852340eb
Component: engine
 2016-03-24 18:34:20 +01:00
allencloud
0986455243 fix typos in daemon_unix.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 25c9bd81f6d293996856daeb19108ebb2522416b
Component: engine
 2016-03-24 23:57:11 +08:00
Lei Jitang
95256bc90a Cleanup: remove redundant period 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: cb5b8767b6988855daa1a264202be929c24c6177
Component: engine
 2016-03-24 08:26:04 -04:00
Brian Goff
d35ea7bea5 Merge pull request #21454 from anusha-ragunathan/fix_overlay 
Move layer mount refcounts to mountedLayer
Upstream-commit: 55bbea375100716ebc0ef16edab567b0627cff0d
Component: engine
 2016-03-23 22:39:38 -04:00
Sebastiaan van Stijn
6cee95ae99 Merge pull request #21268 from calavera/remove_dockerfile_from_api 
Remove dockerfile dependency from the API.
Upstream-commit: 5ef04b1c6d1ca94c83c7ce52faae908a278ce6ea
Component: engine
 2016-03-23 19:34:21 -07:00
Brian Goff
778611a207 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>
Upstream-commit: 65d79e3e5e537039b244afd7eda29e721a93d84f
Component: engine
 2016-03-23 14:42:52 -07:00
Anusha Ragunathan
8ddceeb099 Fix use of mounted() in overlay. 
Handle error and mounted case separately.

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

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e91de9fb9d175541acc95834de486d33feef552a
Component: engine
 2016-03-23 00:33:02 -07:00
Lei Jitang
1981bd700f Merge pull request #21407 from LK4D4/log_stats_errors 
daemon: log errors from stats calls
Upstream-commit: f668e36652e26f92c0f1a7fa3f648e5ed444b68e
Component: engine
 2016-03-23 14:12:12 +08:00
Tõnis Tiigi
730efa6a55 Merge pull request #21107 from cpuguy83/one_ctr_to_rule_them_all 
Move layer mount refcounts to mountedLayer
Upstream-commit: 92a3ece35a10092af0944f175a15b2390f6c666e
Component: engine
 2016-03-22 21:19:00 -07:00
Tibor Vass
7c90f8b43b Merge pull request #21370 from tonistiigi/expose-layer-ids 
Expose RootFS in image inspect
Upstream-commit: 694b32df51ac82afdf4695569e87dad7eaf71de4
Component: engine
 2016-03-22 20:33:18 -04:00
Tibor Vass
48cef14de6 Merge pull request #21367 from mlaventure/containerd-docs-cleanup 
Remove unneeded references to execDriver
Upstream-commit: 3ce494f48cc37b1e4065b62e58ec1c0a5df0e00c
Component: engine
 2016-03-22 19:40:27 -04:00
Alexander Morozov
23e67168ca 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>
Upstream-commit: 14e1325656257c9d96cd01c03e624c99cfc35d31
Component: engine
 2016-03-22 14:03:47 -07:00
Tonis Tiigi
296caafbd2 Expose RootFS in image inspect 
Fixes #20451

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 14dc4a7158a141b5c13aa63231e467f0c3235850
Component: engine
 2016-03-22 13:49:30 -07:00
Tibor Vass
02220a45c4 Merge pull request #21270 from ehazlett/resource-labels 
Add Label support for Images (build), Networks and Volumes on Creation
Upstream-commit: 53d2e5e9d754ce8fbef733759e9ec450514133e3
Component: engine
 2016-03-22 15:12:33 -04:00
David Calavera
f18bd98fd4 Merge pull request #21383 from estesp/shared-userns-net-ipc 
Allow net and IPC namespaces to be shared when userns=on
Upstream-commit: 62d45566544344b6f562bff7792976702ed8938b
Component: engine
 2016-03-22 11:40:12 -07:00
Tibor Vass
85da9b3aae Merge pull request #21223 from cpuguy83/add_nocp_to_vols 
Add explicit flags for volume cp/no-cp
Upstream-commit: de9ff4bdc0e17a0fd455790972d83133f424ef9d
Component: engine
 2016-03-22 13:45:12 -04:00
Evan Hazlett
fe56b4ef22 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>
Upstream-commit: fc214b4408d915e3510f61c7584ca01c176d1373
Component: engine
 2016-03-22 11:49:06 -04:00
Brian Goff
44acd43622 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>
Upstream-commit: 563d0711f83952e561a0d7d5c48fef9810b4f010
Component: engine
 2016-03-22 11:36:28 -04:00
Arnaud Porterie
ea0ebdf222 Merge pull request #21373 from aaronlehmann/client-user-agent-registry-operations 
Pass upstream client's user agent through to registry on operations beyond pulls
Upstream-commit: 9f327b4c2805d3280e4e0ae6fe2d6522e8e753a7
Component: engine
 2016-03-21 21:49:48 -07:00
David Calavera
f73bda8d49 Merge pull request #21354 from Microsoft/jjh/getpids 
Windows: Minimal docker top implementation
Upstream-commit: adc6ed5a1051695cb488c57eea918d3c73566a04
Component: engine
 2016-03-21 19:59:27 -07:00
Phil Estes
19b58f8f21 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)
Upstream-commit: 2b278f48460453691c63ad81b0c87b50d8b18979
Component: engine
 2016-03-21 22:20:26 -04:00
Qiang Huang
ec3df3b28a Remove dot in suffix to avoid double dot error message 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: aae4bcf773a88f854c720387040a0a289a2fca87
Component: engine
 2016-03-22 09:17:54 +08:00
Qiang Huang
42b42ce4ee 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>
Upstream-commit: b041fdc0d53c209a5e0614d2b35c6fa2209fe12d
Component: engine
 2016-03-22 09:17:54 +08:00
Brian Goff
308c81e7d4 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>
Upstream-commit: b0ac69b67ef79c6c937f84bee3df20a1924ad334
Component: engine
 2016-03-21 20:38:44 -04:00
Aaron Lehmann
87c76eb0d7 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>
Upstream-commit: c44e7a3e632c3ea961cb8c12ba45371f54e6699c
Component: engine
 2016-03-21 14:31:47 -07:00
Arnaud Porterie
6c1d291a31 Merge pull request #21306 from mgoelzer/issue20001-nodeps 
Pass upstream client's user agent through to registry on image pulls
Upstream-commit: 278d3962a8cb6a42e9841789bdb8b49a29617e24
Component: engine
 2016-03-21 14:26:59 -07:00
Alexander Morozov
a369a60b8b Merge pull request #21301 from cpuguy83/cleaner_file_log 
Fixes some issues with jsonfile write/read
Upstream-commit: 11b4c89087cb7d6014e6106521ebb92fa74d01ab
Component: engine
 2016-03-21 14:03:36 -07:00
Kenfe-Mickael Laventure
bf213f3332 Remove unneeded references to execDriver 
This includes:
 - updating the docs
 - removing dangling variables

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