0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
28763 commits 14 branches 412 tags 338 MiB
Commit graph

900 commits

Author SHA1 Message Date
Sebastiaan van Stijn
9f0593990f Merge pull request #26941 from runcom/docker-init-path-1 
configure docker-init binary path
 2016-09-28 13:12:59 +02:00
Vincent Demeester
5280ba83e5
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>
 2016-09-28 12:45:30 +02:00
Vincent Demeester
b0e1b8fc79 Merge pull request #24850 from yongtang/24270-service-tasks-filter 
Fix partial/full filter issue in `service tasks --filter`
 2016-09-28 11:50:27 +02:00
Yong Tang
880a5f565f 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>
 2016-09-27 19:12:48 -07:00
Misty Stanley-Jones
bab64af2ad Merge pull request #26931 from thaJeztah/fix-aux-address-example 
Fix incorrect aux-address examples and test
 2016-09-27 17:06:01 -07:00
Vincent Demeester
b881148385 Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure 
Add isolation to info - enables Hyper-V containers CI bring-up
 2016-09-27 18:46:51 +02:00
Antonio Murdaca
6a12685bb7
configure docker-init binary path 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-27 14:49:17 +02:00
allencloud
70bb832060 add endpoint mode in service pretty 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-09-27 18:41:19 +08:00
Sebastiaan van Stijn
fd7161bb30
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>
 2016-09-27 01:12:29 +02:00
Sebastiaan van Stijn
a4dd51a660 Merge pull request #23886 from AkihiroSuda/stackcli 
add `docker stack ls`
 2016-09-26 21:19:04 +02:00
Arnaud Porterie
7944480dd0 Merge pull request #26839 from tonistiigi/build-cache 
Implement build cache based on history array
 2016-09-26 17:31:49 +00:00
Sebastiaan van Stijn
c8a19aee09 Merge pull request #26892 from ripcurld00d/stats_format_docs 
Add documentation for docker stats --format
 2016-09-26 10:52:01 +02:00
Boaz Shuster
9c7b3040cc Add documentation for docker stats --format 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2016-09-26 09:26:48 +03:00
John Howard
c4e1697274 Add isolation to info 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-23 12:13:29 -07:00
Tõnis Tiigi
690882c2e7 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>
 2016-09-23 11:30:06 -07:00
Sebastiaan van Stijn
a70e6dfe80 Merge pull request #26850 from YuPengZTE/devDot 
Del the extra dot
 2016-09-23 10:10:11 +02:00
Vincent Demeester
c03c80b1b0 Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes 
support docker node ps multiNodes
 2016-09-23 09:50:24 +02:00
YuPengZTE
73770c00fc Del the extra dot 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
 2016-09-23 15:22:52 +08:00
Akihiro Suda
5ce08ddfca add docker stack ls 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-22 19:31:39 +00:00
Amir Goldstein
05bac4591a overlay2: add support for --storage-opt size 
Allow passing --storage-opt size=X to docker create/run commands
for the `overlay2` graphriver.

The size option is only available if the backing fs is xfs that is
mounted with the `pquota` mount option.
The user can pass any size less then the backing fs size.

Signed-off-by: Amir Goldstein <amir73il@aquasec.com>
 2016-09-22 07:03:14 +03:00
Sebastiaan van Stijn
c5f4a1ab19 Merge pull request #26413 from lixiaobing10051267/masterLabel 
Labels info ommitted while inspecting self-defined network
 2016-09-22 02:07:53 +02:00
Misty Stanley-Jones
7b5c3d935a Clarify usage of --force when used on a swarm manager 
Fixes #26125

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-21 13:05:33 -07:00
Vincent Demeester
00615efced Merge pull request #25025 from cpuguy83/service_inspect_formatter 
Add formatter for service inspect
 2016-09-20 14:49:45 +02:00
Sebastiaan van Stijn
374ae5ce13 Merge pull request #26732 from yuexiao-wang/update-index 
Update on index reference documentation
 2016-09-20 11:42:17 +02:00
yuexiao-wang
0483d77613 Update on index refernce documentation 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-20 16:37:52 +08:00
Vincent Demeester
a43691d645 Merge pull request #26482 from yuexiao-wang/add-option 
Update the options for docker client
 2016-09-20 09:51:57 +02:00
Michael Crosby
ee3ac3aa66 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>
 2016-09-19 17:33:50 -07:00
Brian Goff
54ba82beab 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>
 2016-09-19 16:28:19 -04:00
Sebastiaan van Stijn
bb6fe56e88 Merge pull request #26268 from AkihiroSuda/eventsjsonl 
add `docker events --format`
 2016-09-19 17:30:27 +02:00
Sebastiaan van Stijn
533b00da8b
Fix Markdown formatting and missing prompt in service create 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-19 13:57:39 +02:00
Misty Stanley-Jones
5880d62953
Misty's edits and additions 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
 2016-09-19 12:12:54 +02:00
Sebastiaan van Stijn
eb3a01eb43 Add --mount syntax documentation to CLI reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-19 11:56:59 +02:00
yuexiao-wang
0f0b0db842 fix typo for docs reference 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-18 11:00:19 +08:00
John Howard
4a0419f536 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
 2016-09-17 09:31:24 -07:00
Sebastiaan van Stijn
1c117aa8cc Merge pull request #26289 from aboch/doc 
Fix mtu option in documentation
 2016-09-17 03:32:23 +02:00
John Howard
340e5233b2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 11:56:15 -07:00
Sebastiaan van Stijn
87b174080b
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>
 2016-09-16 17:22:58 +02:00
Sebastiaan van Stijn
7ca02f86de
Add link to logging drivers reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-16 15:29:28 +02:00
Sebastiaan van Stijn
dddea689ab
Synchronize push reference with man page 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-15 18:53:46 +02:00
Sebastiaan van Stijn
edbb8fb86d
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>
 2016-09-15 16:09:24 +02:00
Akihiro Suda
5af5a1be62 add docker events --format 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-15 09:55:29 +00:00
Anusha Ragunathan
e482d4ee71 Merge pull request #26575 from anusha-ragunathan/update_plugin_docs 
Update plugin install docs with registry specifics.
 2016-09-14 14:43:41 -07:00
Anusha Ragunathan
81d5abf334 Update plugin install docs with registry specifics. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-09-14 10:21:31 -07:00
Sebastiaan van Stijn
9e9ba1e1c1 Merge pull request #26526 from lixiaobing10051267/masterSymble 
fix some incorrect symbols before executing command
 2016-09-14 17:48:43 +02:00
lixiaobing10051267
7b73b5fd6a fix some incorrect symbols before executing command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-14 22:28:09 +08:00
Sebastiaan van Stijn
8ac2000f50 Merge pull request #25540 from estesp/ro-plus-userns 
Remove --read-only restriction when user ns enabled
 2016-09-14 13:53:58 +02:00
Vincent Demeester
0c90f777b7 Merge pull request #26489 from yuexiao-wang/update-exec 
update option for docker exec
 2016-09-13 11:16:22 +02:00
yuexiao-wang
7084aa24c7 update option for docker commands 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-12 19:10:45 +08:00
yuexiao-wang
1917d3b958 add option and update the description 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-12 16:08:59 +08:00
Yong Tang
256dbe4b75 Fix documentation for Step 0 to Step 1 in docker build 
The indexing of steps in the output of `docker build` starts with `Step 1`.
However, there are several places in the docs that start with `Step 0`.

This fix addresses the issue and changes `Step 0` to `Step 1` (and subsequent steps).

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-11 10:52:40 -07:00