docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity
20,121 Commits 12 Branches 297 Tags
efe1efbbf1afad29fb6e9bf43bcf0a707f0fe2dc
Commit Graph

2573 Commits

Author SHA1 Message Date
Stefan Scherer
8f5a861b89 prevent journald from being built on ARM 
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
Upstream-commit: 6f6f10a75f8b447637e8a89d685452871899e9c0
Component: engine
 2015-11-21 15:17:31 +01:00
David Calavera
4c65875314 Move exec store to its own package inside the daemon. 
Remove double reference between containers and exec configurations by
keeping only the container id.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9ca2e4e81cdb950f2b5958a7712153d1a6dd6e4c
Component: engine
 2015-11-20 17:40:16 -05:00
Michael Crosby
2b61f40d62 Merge pull request #18051 from calavera/extract_streams 
Extract StreamConfig struct out of the daemon package.
Upstream-commit: b5c507750f2c7f616ed94ad502f5f6904cad4eac
Component: engine
 2015-11-20 13:45:13 -08:00
David Calavera
a043562f2a Extract StreamConfig struct out of the daemon package. 
This is a small configuration struct used in two scenarios:

1. To attach I/O pipes to a running containers.
2. To attach to execution processes inside running containers.

Although they are similar, keeping the struct in the same package
than exec and container can generate cycled dependencies if we
move any of them outside the daemon, like we want to do
with the container.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3f5b8f712d693188b41b3d9b55e5e5213be48ef5
Component: engine
 2015-11-20 15:04:27 -05:00
Vincent Demeester
4d4420c373 Merge pull request #18073 from runcom/hostconfig-resources 
runconfig: split resources into a struct
Upstream-commit: f064b9941c0c6070740339971a0bb59b4fe6195f
Component: engine
 2015-11-20 20:29:44 +01:00
David Calavera
9479751884 Merge pull request #17718 from wenchma/17716_before_filter_doc 
Re-implement --before and --since as options for --filter
Upstream-commit: 8fa09749fb7b5560ffc7f0a73005302f99d89d01
Component: engine
 2015-11-20 11:24:19 -08:00
Antonio Murdaca
012bc4d1d4 runconfig: split resources into a struct 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1a0b483e02aff72c16871fb2f74644e091bda93c
Component: engine
 2015-11-20 19:40:01 +01:00
Wen Cheng Ma
9380772bfb Re-implement --before and --since as options for --filter 
* This commit will mark --before and --since as deprecated, but leave their behavior
  unchanged until they are removed, then re-implement them as options for --filter.

* And update the related docs.

* Update the integration tests.

Fixes issue #17716

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 1921c629381d25ebff7b8b8c8348a0a81525f264
Component: engine
 2015-11-20 13:10:13 +08:00
NIWA Hideyuki
4581692a0e Addition of "--shm-size" to which size of /dev/shm is changed. 
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
  when container is made.
- Being able to specify is a numerical value that applies number,
  b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.

Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
Upstream-commit: 5aeaf2a0c4236711e0981515d8627b30e22a1637
Component: engine
 2015-11-20 09:24:18 +09:00
Alexander Morozov
3221274c6e Merge pull request #18084 from wenchma/18054_exec_start_fix 
Update docs and test of exec create api return codes
Upstream-commit: 8e6e38990cb09eca2575263240d45a2a55db292e
Component: engine
 2015-11-19 13:51:46 -08:00
Alexander Morozov
27b2c588e8 Merge pull request #18076 from rhvgoyal/unmount-recursive 
Unmount recursively to unmount volumes
Upstream-commit: 24fb3659dfe1b4f4dfa4592699fb53d0868a95fe
Component: engine
 2015-11-19 13:46:48 -08:00
Alexander Morozov
fd8d0f506e Merge pull request #17908 from calavera/carry_17059 
[Carry 17059] allow filtering containers by any status
Upstream-commit: 37f64ded44249fb174ba1797d6f6183575375300
Component: engine
 2015-11-19 13:24:43 -08:00
Vivek Goyal
712fdcff89 Use lazy unmount to unmount volumes 
Volumes can have more mount points beneath them and unmount will fail. This
is the case when a bind mounted directory on host already had a mount point
underneath it. So use lazy unmount instead.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: b9e701b203ff49966aac00e058feb5d46bbb97f0
Component: engine
 2015-11-19 20:46:07 +00:00
Kamil Domański
1d7fc30a8e allow filtering containers by any status 
Signed-off-by: Kamil Domański <kamil@domanski.co>
(cherry picked from commit 9ada6a06c57ce4ed4bfad50f603962b7b9ce6fb1)
Upstream-commit: f30364c5835452598e58781f360681f2d77fa16c
Component: engine
 2015-11-19 14:11:41 -05:00
John Howard
9f741a440b Windows: [TP4] docker info crashes 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 37d2a7003864f8bdb5d8f6e3d9dcb4367fc94a6a
Component: engine
 2015-11-19 11:02:25 -08:00
Wen Cheng Ma
7d68517eab Update docs and test of exec create api return codes 
Fixes issue #18054

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 01b86d612cba22602509b436aad36d41135f14ce
Component: engine
 2015-11-19 22:22:27 +08:00
Vincent Demeester
12f51add56 Merge pull request #17704 from LK4D4/default_cgroupfs 
Use fs cgroups by default
Upstream-commit: c32f8bb36a5f1b2fe0586a1e080c14d8a6b68610
Component: engine
 2015-11-19 14:01:13 +01:00
Alexander Morozov
92c9b9e9d4 Use fs cgroups by default 
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 419fd7449fe1a984f582731fcd4d9455000846b0
Component: engine
 2015-11-18 16:16:13 -08:00
Michael Crosby
1ec73033b7 Merge pull request #18065 from calavera/one_container_constructor_to_rule_them_all 
Remove the container initializers per platform.
Upstream-commit: 877fe61f7538a36c5fe312221356f13b83abbf64
Component: engine
 2015-11-18 14:06:47 -08:00
David Calavera
b104ad8df6 Remove the container initializers per platform. 
By removing deprecated volume structures, now that windows mount volumes we don't need a initializer per platform.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 060f4ae6179b10aeafa883670826159fdae8204a
Component: engine
 2015-11-18 08:41:46 -05:00
Kenjiro Nakayama
8bf64dbed0 docker info suppports case-insensitive proxy env settings 
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Upstream-commit: 84781a5df753f5ba127538e8542fcb7c94bb56fa
Component: engine
 2015-11-18 10:58:19 +09:00
Michael Crosby
1944ac916a Merge pull request #17261 from mountkin/remove-unused-daemon-config 
remove the unused DefaultNetwork member from daemon.Config
Upstream-commit: 3f508f08deca82536b4e1ef6d591335e98e3f5d1
Component: engine
 2015-11-17 16:33:11 -08:00
Michael Crosby
c4d89a3f60 Merge pull request #17478 from vdemeester/pr-13921 
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
Upstream-commit: 104dab87ea73fbf7e4e592c2045b4f1ab56c6cfe
Component: engine
 2015-11-17 15:44:57 -08:00
Alexander Morozov
804455e1fb Merge pull request #17593 from daehyeok/refactoring_json_log 
Refactoring json log driver
Upstream-commit: adce1981f4c7fe653ae76cdd1f84d75f88b273cd
Component: engine
 2015-11-17 15:38:52 -08:00
Alexander Morozov
ab3af36722 Merge pull request #18002 from Microsoft/10662-registerlinks 
Windows: Disable links
Upstream-commit: d3744fbeb109bffbaeba35c94858afe3bf50376c
Component: engine
 2015-11-17 11:48:53 -08:00
Michael Crosby
f3cdb6f05f Merge pull request #17974 from anusha-ragunathan/fsMagic 
Fix devmapper backend in docker info
Upstream-commit: 1ecb9a40db176489ac8760251abe56e560bc848d
Component: engine
 2015-11-17 11:44:48 -08:00
Alexander Morozov
1d5287a6dd Merge pull request #16639 from mrunalp/skip_dev_setup 
Skip /dev setup in container when it is bind mounted in
Upstream-commit: 91876563052a1d84902e365cbe8b9eaf96846e91
Component: engine
 2015-11-17 11:36:00 -08:00
Alexander Morozov
07479c944e Merge pull request #16452 from rhatdan/btrfs-selinux 
Relabel BTRFS Content on container Creation
Upstream-commit: 4dda67b8014e71508e992c736febc5c45c53c095
Component: engine
 2015-11-17 11:03:40 -08:00
Alexander Morozov
22f6a379ae Merge pull request #17300 from kunalkushwaha/plugin-info 
Patch for Plugin drivers in docker info 
Upstream-commit: f18d5da6a7d148581f8de041ada62b1724839957
Component: engine
 2015-11-17 10:46:29 -08:00
David Calavera
567557144f Merge pull request #18025 from Microsoft/10662-ArgumentEscaping 
Windows: Fix docker exec
Upstream-commit: 6f1bc096a64efb592b56dbdefc5bfce1fa7935d3
Component: engine
 2015-11-17 11:14:54 +01:00
Darren Stahl
05e1d2c256 Typo in previous PR processConfig, not c.ProcessConfig 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: d7692b02bdeafc2837bf4269527c2eaa8be254b1
Component: engine
 2015-11-16 11:56:01 -08:00
Alexander Morozov
cbf9321ca8 Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels 
Allow configurable metadata for Splunk log driver
Upstream-commit: a3065fa48f889ef438a7d7339ebc8fe01aca10dd
Component: engine
 2015-11-16 10:11:27 -08:00
Tibor Vass
8bae47da35 Merge pull request #17985 from Microsoft/jjh/firstboot 
Windows: [TP4] Fix regression on second or later container starts
Upstream-commit: 92487d7fb4963c0333c409d053ff694e619c538d
Component: engine
 2015-11-16 10:03:46 +01:00
Kunal Kushwaha
3e26fccb77 Supported added for reterving Plugin list for Network and Volume. 
Also, plugin information in docker info output.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
Upstream-commit: aa7fd884e609d3d13df628600a1799e0e76444e9
Component: engine
 2015-11-16 15:28:09 +09:00
John Howard
5b2890f6ff Windows: Disable links 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b2771b4456f12c0f55ee0f1e70d620fe1a77ca4f
Component: engine
 2015-11-15 21:32:31 -08:00
Sebastiaan van Stijn
c9ee279a92 Merge pull request #17479 from coolljt0725/show_warning 
Show warning when user specify dm.basesize for already initialized devicemapper driver
Upstream-commit: cf824d974922ae7ad55548b3f0050a2bb0e29aa2
Component: engine
 2015-11-15 08:51:33 +01:00
daehyeok mun
c0f1567bbc Extract rotate file writer from json log driver 
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: 086c0b4a6616e8db8009a5d72411bcc6774adaf1
Component: engine
 2015-11-14 16:15:44 -07:00
Vincent Demeester
964f8b63bd Add pkg/parsers/architecture and pkg/platform 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 49779b674af09b46c165c8dfe2e76054336b0595
Component: engine
 2015-11-14 23:03:02 +01:00
Olle Jonsson
3e0bec1370 /info: Add keys Architecture, OSType 
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
Upstream-commit: 4e8fcd40028ed09b139b6f86954e676a1839be9c
Component: engine
 2015-11-14 22:21:45 +01:00
John Howard
ffe3114f57 Windows: Fix regresion on first boot 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8da449055fd2fb60e45391c8482865dca3d0232f
Component: engine
 2015-11-14 11:06:19 -08:00
Antonio Murdaca
6f1a30b2e2 Merge pull request #17851 from Microsoft/10662-ArgumentEscaping 
Prevent double escaping of Dockerfile commands on Windows
Upstream-commit: ad8a66573c61483b9a0721470438dfc8bd01993f
Component: engine
 2015-11-14 17:25:53 +01:00
Anusha Ragunathan
666ae52a68 Fix devmapper backend in docker info 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: fdc2641c2b329c48cf1d1c8c0b806bec8784b3e0
Component: engine
 2015-11-13 21:05:47 -08:00
Michael Crosby
b80faeb568 Merge pull request #17977 from Microsoft/jjh/archivewindowscomment 
Windows: Fixes comment in archive_windows.go
Upstream-commit: 439633cee63dd77c45348b57b4ec7e1332c6206f
Component: engine
 2015-11-13 16:00:14 -08:00
Michael Crosby
040ce59c2f Merge pull request #17979 from Microsoft/jjh/tidytodowindows 
Remove 'TODO Windows' unnecessary comment
Upstream-commit: 58244392e5e42bfa13114ff2cec60ef176ec173f
Component: engine
 2015-11-13 15:59:06 -08:00
unclejack
d91b38c0d5 Merge pull request #17877 from aaronlehmann/capped-bytespipe 
Cap the amount of buffering done by BytesPipe
Upstream-commit: 13963957ebadc663915aed8c61451a93db41c27c
Component: engine
 2015-11-14 00:51:11 +02:00
Alexander Morozov
5113a5250e Merge pull request #17980 from Microsoft/jjh/configuresysinit 
Remove uncalled configureSysInit
Upstream-commit: 5e2d4aaec22cd09e823ee976202515ac992dec20
Component: engine
 2015-11-13 14:30:03 -08:00
John Howard
a0d620ddb8 Remove uncalled configureSysInit 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2648655a4a0aaf41e02dec4064c5b6e68fa7b9fe
Component: engine
 2015-11-13 13:43:09 -08:00
John Howard
0c8ae9b87a Remove TODO Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 208ad80605e5c8c48f77f1b89b25951767135224
Component: engine
 2015-11-13 13:07:27 -08:00
John Howard
a7cde865c9 Windows: Fixes comment 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e5261d6e4a1e96d4c0fa4b4480042046b695eda1
Component: engine
 2015-11-13 12:51:05 -08:00
Alexander Morozov
1a8e0677b9 Merge pull request #17417 from cpuguy83/15815_add_log_file_poller 
Fallback to file polling for jsonlog reader on err
Upstream-commit: 42fa8e31284c76f485bed81ed2e1327d60e5cb13
Component: engine
 2015-11-13 11:49:54 -08:00