Commit Graph

773 Commits

Author SHA1 Message Date
9fc27540de Add config parameter to change per-container stop timeout during daemon shutdown
This fix tries to add a flag `--stop-timeout` to specify the timeout value
(in seconds) for the container to stop before SIGKILL is issued. If stop timeout
is not specified then the default timeout (10s) is used.

Additional test cases have been added to cover the change.

This fix is related to #22471. Another pull request will add `--shutdown-timeout`
to daemon for #22471.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e66d2108911a2fad016205bdd6bf181f7e822c1c
Component: engine
2016-10-17 12:28:46 -07:00
314b4d907f Merge pull request #27452 from lucafavatella/fix-typo-in-build-ref
Fix typo in build documentation
Upstream-commit: 92e2a62891c063bc992a5a0afe496a5b1236f6eb
Component: engine
2016-10-17 10:53:36 -07:00
7b84e05ca6 Merge pull request #24771 from aquasecurity/xfs_quota
Implement XFS quota for overlay2
Upstream-commit: 8863a9f62cb16fbdbb318165ffc8140aeb32c597
Component: engine
2016-10-17 09:23:42 -07:00
fe93ff90e7 Fix typo in build documentation
Signed-off-by: Luca Favatella <luca.favatella@erlang-solutions.com>
Upstream-commit: 6dbd1e952b00543dd0c2d57e3dc139ca6de6c94a
Component: engine
2016-10-17 16:48:25 +01:00
04d1de1324 Remove Fedora 22 from RPM build as it is EOL
Fedora 22 reached end of life on July 19th, and
will no longer receive updates;

https://fedoramagazine.org/fedora-22-end-of-life-2016-july/

With the recent release of Fedora 24, Fedora 22 will officially enter End Of
Life (EOL) status on July 19th, 2016. After July 19th, all packages in the
Fedora 22 repositories will no longer receive security, bugfix, or enhancement
updates, and no new packages will be added to the Fedora 22 collection.

Upgrading to Fedora 23 or Fedora 24 before July 19th 2016 is highly recommended
for all users still running Fedora 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ff405a1d2b9cb7ccbd315e882b6bd7560eb4159c
Component: engine
2016-10-16 21:13:26 -07:00
9fe833df60 Convert Markdown frontmatter to YAML
Some frontmatter such as the weights, menu stuff, etc is no longer used
'draft=true' becomes 'published: false'

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: b30609446d212624e3d4ce814c70130b75c552a0
Component: engine
2016-10-14 15:44:55 -07:00
c092dceac4 Merge pull request #27363 from tealtail/26227-add-stack-ps-to-docs
add documentation for `docker stack ps`, Fixes #26227 
Upstream-commit: e8e1c4dfb9a67c56b1001b39f1079a29f7ac8d5a
Component: engine
2016-10-14 10:02:26 -07:00
ce4d071742 add documentation for docker stack ps
also updates related stack docs and removes stack_tasks.md

Signed-off-by: Alicia Lauerman <allydevour@me.com>
Upstream-commit: 970ab9a224658e17894a7673189ad9d2491a592d
Component: engine
2016-10-13 15:09:58 -04:00
83dc9e6cea Implement Pause Resume support for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 69985e85d37af827fe2940a35d13e8b20a08fc8c
Component: engine
2016-10-11 16:23:35 -07:00
01236b1c83 Improve --log-level help text
This information was added in
1efc940e6f547760e5e8f4648acb120ff19fdc58,
but removed again in
a271eaeba224652e3a12af0287afbae6f82a9333
to make the help-output fit in a 80-chars
terminal.

This adds the available options again
in the help output, and updates the CLI
reference documentation to match actual
output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3197b312d03e6dc2c12a815bbc2632edfb03bb25
Component: engine
2016-10-10 23:10:17 +02:00
216da195bc Add the OPTIONS and Fix the links for contain prune
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6396c62fdc5355ff097da6a131cb176a5f521470
Component: engine
2016-10-11 00:13:33 +08:00
6453548dcb Fix the incorrect links
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4b61b18ed2a137eaa27d76e0c57b7fe8f6600172
Component: engine
2016-10-10 23:26:05 +08:00
d1b375bf46 Merge pull request #23389 from Microsoft/jjh/credentialspec
Windows: Support credential specs
Upstream-commit: b3cc3d7bf9606b64833d5596fee84bff416652c3
Component: engine
2016-10-07 18:32:44 +02:00
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
75a301f015 Windows: Support credential specs
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e85867cb68cc28208c91bb43fc5cdcff824c468e
Component: engine
2016-10-06 09:32:22 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
b3a741308d 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>
Upstream-commit: 05bac4591a4519fbac9d3724f3b708e882bbad80
Component: engine
2016-09-22 07:03:14 +03:00
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
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
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
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
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
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
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