p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,751 Commits 2 Branches 295 Tags
ae6ecc60f9963307d03fb9df56250ca65deda800
Commit Graph

758 Commits

Author SHA1 Message Date
Vincent Demeester
6be324c5f4 Merge pull request #26882 from runcom/proxy-path 
Specify userland proxy path
Upstream-commit: 91312f71aabe4f0840060049259fc6dbfcc62cd2
Component: engine
 2016-10-07 09:44:39 +02:00
Antonio Murdaca
b79ddee1da daemon: add --userland-proxy-path flag 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: dd2e1947dc58d6807a5ddc401f84184fc5a77c2a
Component: engine
 2016-10-06 17:31:53 +02:00
Alexander Morozov
2e8039dc97 Merge pull request #25837 from reaperhulk/support-compressing-build-context 
Add support for compressing build context during image build
Upstream-commit: f08a450ad35706900766e7766d30a90d688e410b
Component: engine
 2016-10-05 12:57:46 -07:00
Arnaud Porterie
dcd98584e4 Merge pull request #26108 from mlaventure/data-mngt 
New Data Management commands
Upstream-commit: 86de7c000f5d854051369754ad1769194e8dd5e1
Component: engine
 2016-10-01 03:17:18 +00:00
Paul Kehrer
02efb59787 Add support for compressing build context during image build 
When sending a build context to a remote server it may be
(significantly) advantageous to compress the build context. This commit
adds support for gz compression when constructing a build context
using a command like "docker build --compress ."

Signed-off-by: Paul Kehrer <paul.l.kehrer@gmail.com>
Upstream-commit: 4825e58a96188e6a9c739c31966c8ac5a2bbd1d7
Component: engine
 2016-09-30 17:46:08 -05:00
Kenfe-Mickael Laventure
881a82ffc0 Add documentation for container, volume, image and system prune subcommands 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 913e5cb77bcb7134be2e9b1aaa7e63627285e676
Component: engine
 2016-09-30 14:35:23 -07:00
Yong Tang
3f16b8db80 Update docs for node filter of docker service ps 
As is specified in 26964, it is possible to specify
a filter based on the node name or node ID.

This fix updates the related docs for that.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c326e0afe39d19a789f0819cb3d81259167a762f
Component: engine
 2016-09-30 05:37:14 -07:00
Vincent Demeester
a3bb730c44 Merge pull request #24411 from vdemeester/24393-ps-filter-managed 
Add a new "is-task" ps filter
Upstream-commit: b6ad6d98fd5037c44cc38d000e5a35bd808bff7d
Component: engine
 2016-09-29 18:54:15 +02:00
Misty Stanley-Jones
3f1e962107 Fix link to non-existent file 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: ca04f02d7655e7306c7c0cde6fa1895a14f0a673
Component: engine
 2016-09-28 20:34:26 -07:00
Sebastiaan van Stijn
8a19fb43a4 Merge pull request #26941 from runcom/docker-init-path-1 
configure docker-init binary path
Upstream-commit: 9f0593990f6d8ac95a5dde312e0b7401b472cfb9
Component: engine
 2016-09-28 13:12:59 +02:00
Vincent Demeester
48a609d72c Add a new "is-task" ps filter 
This makes it easier to list containers that are part of a task
(swarm mode) and those who are not.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5280ba83e55b94b9d4973a15381e18eb10920233
Component: engine
 2016-09-28 12:45:30 +02:00
Vincent Demeester
f6b8936533 Merge pull request #24850 from yongtang/24270-service-tasks-filter 
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: b0e1b8fc79af0baf5d90329254aacbdfb4188bfc
Component: engine
 2016-09-28 11:50:27 +02:00
Yong Tang
d295583beb Update docs for service ps 
This fix updates docs for `service ps` as now the TASK ID part has been
removed.

Also, this fix fixes several incorrect sample output.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 880a5f565fb33b445977bb2ded0fc375edee0c40
Component: engine
 2016-09-27 19:12:48 -07:00
Misty Stanley-Jones
048d1e7728 Merge pull request #26931 from thaJeztah/fix-aux-address-example 
Fix incorrect aux-address examples and test
Upstream-commit: bab64af2ad0d6f5e7c1e9d54b2f6d93096f7b99f
Component: engine
 2016-09-27 17:06:01 -07:00
Vincent Demeester
4ab44ced86 Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure 
Add isolation to info - enables Hyper-V containers CI bring-up
Upstream-commit: b881148385685f3c538a3a085207bfdf30ae9213
Component: engine
 2016-09-27 18:46:51 +02:00
Antonio Murdaca
195692ee1c configure docker-init binary path 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 6a12685bb7eaa5744c5a115ffe12f3a4d80093bb
Component: engine
 2016-09-27 14:49:17 +02:00
allencloud
99ee0aae26 add endpoint mode in service pretty 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 70bb832060ae1a0525a34145f85e68e0da78fcb9
Component: engine
 2016-09-27 18:41:19 +08:00
Sebastiaan van Stijn
6b1c398ebc Fix incorrect aux-address examples and test 
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.

Before this change, the example command
would send this API request;

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "a": "192.170.1.5",
              "b": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

After this change, the request looks
like this (all aux-addresses preserved);

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "AuxiliaryAddresses": {
              "my-router": "192.168.1.5",
              "my-switch": "192.168.1.6"
            },
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "my-printer": "192.170.1.5",
              "my-nas": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fd7161bb3061e2e2f56faed1a4ba1f7a887627bf
Component: engine
 2016-09-27 01:12:29 +02:00
Sebastiaan van Stijn
f2233e9c75 Merge pull request #23886 from AkihiroSuda/stackcli 
add `docker stack ls`
Upstream-commit: a4dd51a6601f7cb07b23a55134dc18a12d2814ee
Component: engine
 2016-09-26 21:19:04 +02:00
Arnaud Porterie
356aff7cd8 Merge pull request #26839 from tonistiigi/build-cache 
Implement build cache based on history array
Upstream-commit: 7944480dd0dfb00323f960d37c31d0ddad5f6cf2
Component: engine
 2016-09-26 17:31:49 +00:00
Sebastiaan van Stijn
1b0bbf5fcf Merge pull request #26892 from ripcurld00d/stats_format_docs 
Add documentation for docker stats --format
Upstream-commit: c8a19aee09756867d68ae8c70c2134a0193866ac
Component: engine
 2016-09-26 10:52:01 +02:00
Boaz Shuster
f2acf43e07 Add documentation for docker stats --format 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 9c7b3040cc97dae0a4fc20f999ca51adce353944
Component: engine
 2016-09-26 09:26:48 +03:00
John Howard
a034d841ce Add isolation to info 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c4e169727474f24cb0eddea15b94aaa2bfbb3281
Component: engine
 2016-09-23 12:13:29 -07:00
Tõnis Tiigi
cc3c0d322a Implement build cache based on history array 
Based on work by KJ Tsanaktsidis

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>
Upstream-commit: 690882c2e79c3f3742c709cf158584e61594ba00
Component: engine
 2016-09-23 11:30:06 -07:00
Sebastiaan van Stijn
89f68050aa Merge pull request #26850 from YuPengZTE/devDot 
Del the extra dot
Upstream-commit: a70e6dfe80c8b224b1df4510a3729c9a2c1d249e
Component: engine
 2016-09-23 10:10:11 +02:00
Vincent Demeester
69f06771c4 Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes 
support docker node ps multiNodes
Upstream-commit: c03c80b1b03f3a061072af07d6d1fb811f29a9e3
Component: engine
 2016-09-23 09:50:24 +02:00
YuPengZTE
d9ba2cf275 Del the extra dot 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 73770c00fc322929215108a44049e51f1d89cae5
Component: engine
 2016-09-23 15:22:52 +08:00
Akihiro Suda
0d2c33693e add docker stack ls 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5ce08ddfcae5ded73ef0c93c9daba7c916c21ae5
Component: engine
 2016-09-22 19:31:39 +00:00
Sebastiaan van Stijn
ad119a9fca Merge pull request #26413 from lixiaobing10051267/masterLabel 
Labels info ommitted while inspecting self-defined network
Upstream-commit: c5f4a1ab1947d4c9084e1849db77594886b8fe95
Component: engine
 2016-09-22 02:07:53 +02:00
Misty Stanley-Jones
0eb9a616d1 Clarify usage of --force when used on a swarm manager 
Fixes #26125

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 7b5c3d935a7a99b282f0f859101c887894a0b00e
Component: engine
 2016-09-21 13:05:33 -07:00
Vincent Demeester
2b811c42ec Merge pull request #25025 from cpuguy83/service_inspect_formatter 
Add formatter for service inspect
Upstream-commit: 00615efced8c8bd27c61ebd1dfc704bcf870cbaf
Component: engine
 2016-09-20 14:49:45 +02:00
Sebastiaan van Stijn
1504a332aa Merge pull request #26732 from yuexiao-wang/update-index 
Update on index reference documentation
Upstream-commit: 374ae5ce13a91dc7db74485aa99bfe9a361c4719
Component: engine
 2016-09-20 11:42:17 +02:00
yuexiao-wang
dadce77b75 Update on index refernce documentation 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 0483d776130aa6b7add845bdab3d1d8ee67f7480
Component: engine
 2016-09-20 16:37:52 +08:00
Vincent Demeester
37aff3fb80 Merge pull request #26482 from yuexiao-wang/add-option 
Update the options for docker client
Upstream-commit: a43691d645e085ad532fdd87a63e9143ba24420a
Component: engine
 2016-09-20 09:51:57 +02:00
Michael Crosby
8ee0f56810 Add init process for zombie fighting 
This adds a small C binary for fighting zombies.  It is mounted under
`/dev/init` and is prepended to the args specified by the user.  You
enable it via a daemon flag, `dockerd --init`, as it is disable by
default for backwards compat.

You can also override the daemon option or specify this on a per
container basis with `docker run --init=true|false`.

You can test this by running a process like this as the pid 1 in a
container and see the extra zombie that appears in the container as it
is running.

```c

int main(int argc, char ** argv) {
	pid_t pid = fork();
	if (pid == 0) {
		pid = fork();
		if (pid == 0) {
			exit(0);
		}
		sleep(3);
		exit(0);
	}
	printf("got pid %d and exited\n", pid);
	sleep(20);
}
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ee3ac3aa66bfb27b7c21dfb253fdaa113baedd4e
Component: engine
 2016-09-19 17:33:50 -07:00
Brian Goff
1b60c220e3 Add formatter for service inspect 
Allows the user to use `pretty` as the format string.
This enables users to put custom format options into their CLI config
just like is supported for `docker ps` and `docker images`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 54ba82beab8ef8b71f5a6a2f7082ed7759b40df3
Component: engine
 2016-09-19 16:28:19 -04:00
Sebastiaan van Stijn
14f9dd10a3 Merge pull request #26268 from AkihiroSuda/eventsjsonl 
add `docker events --format`
Upstream-commit: bb6fe56e8847112e55429309bf3ac004753ae3a8
Component: engine
 2016-09-19 17:30:27 +02:00
Sebastiaan van Stijn
4d3a9b605f Fix Markdown formatting and missing prompt in service create 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 533b00da8bed8336debf99a03f2fd2a0692fac6e
Component: engine
 2016-09-19 13:57:39 +02:00
Misty Stanley-Jones
dd0606cd40 Misty's edits and additions 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
Upstream-commit: 5880d629533d9b8ad9889500fe841cb2e31a71c8
Component: engine
 2016-09-19 12:12:54 +02:00
Sebastiaan van Stijn
e605090acb Add --mount syntax documentation to CLI reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: eb3a01eb432473beae968a0c9f3817af8b7a7d53
Component: engine
 2016-09-19 11:56:59 +02:00
yuexiao-wang
c4eabb777e fix typo for docs reference 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 0f0b0db842e53c81191385395d6d040574eeb0d9
Component: engine
 2016-09-18 11:00:19 +08:00
John Howard
5049c43226 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
Upstream-commit: 4a0419f536ce3a7b1eade67440cfc84d6e486caf
Component: engine
 2016-09-17 09:31:24 -07:00
Sebastiaan van Stijn
6c1fbaf344 Merge pull request #26289 from aboch/doc 
Fix mtu option in documentation
Upstream-commit: 1c117aa8cccd895645e6fb5245bfb4cd11b93ba8
Component: engine
 2016-09-17 03:32:23 +02:00
John Howard
7342ae40e2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
 2016-09-16 11:56:15 -07:00
Sebastiaan van Stijn
15e6354e7d Use "sudo" for dockerd examples 
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 87b174080bd8b1b9ea2bbfad8ef35a4c0dfe8ad4
Component: engine
 2016-09-16 17:22:58 +02:00
Sebastiaan van Stijn
6f7161dac7 Add link to logging drivers reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7ca02f86de2ceef980cad98faefc15cbc628c91a
Component: engine
 2016-09-16 15:29:28 +02:00
Sebastiaan van Stijn
00c4e8a77c Synchronize push reference with man page 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dddea689ab45ce146e6ac3a1199235e1f36ffe29
Component: engine
 2016-09-15 18:53:46 +02:00
Sebastiaan van Stijn
78d01f16b4 Restore missing "format" example 
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: edbb8fb86d7d0b715adc15415f0cb187433092a5
Component: engine
 2016-09-15 16:09:24 +02:00
Akihiro Suda
e6635a948e add docker events --format 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5af5a1be6209bde3f05b5f9ed4e0db0037dfe0ff
Component: engine
 2016-09-15 09:55:29 +00:00
Anusha Ragunathan
470e277786 Merge pull request #26575 from anusha-ragunathan/update_plugin_docs 
Update plugin install docs with registry specifics.
Upstream-commit: e482d4ee71b00bb3ea1a71381cef9771b14eff6c
Component: engine
 2016-09-14 14:43:41 -07:00