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

1332 Commits

Author SHA1 Message Date
yuexiao-wang
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
yuexiao-wang
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
Vincent Demeester
dca3d10db4 Merge pull request #26996 from Microsoft/jjh/imageinspectosversion 
(Windows) Inspect image populate OSVersion
Upstream-commit: febf53d91a43fe13fbb802d9e6b7b6732183cf21
Component: engine
 2016-10-07 18:33:01 +02:00
Vincent Demeester
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
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
John Howard
e61236d868 Inspect populate image OSVersion 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b7f537e811d40244c76da93319e3f6f30c4c88e3
Component: engine
 2016-10-06 11:46:24 -07:00
John Howard
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
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
Victor Vieux
06272d8590 Revert "fix API doc service delete" 
This reverts commit a12120e78c5852d5571da38e7b9e4cd49f41edc3.

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: bd996414667785fb6f69348038f973cfce20a2bc
Component: engine
 2016-10-01 02:12:41 -07:00
Victor Vieux
b0dfc9bb7f fix API doc service delete 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: a12120e78c5852d5571da38e7b9e4cd49f41edc3
Component: engine
 2016-09-30 22:31:40 -07:00
allencloud
9a44b50701 make remove network return 204 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: ea07ef7a7c3a221d6167cc2e36806ed9615ac973
Component: engine
 2016-10-01 19:50:40 +08: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
Kenfe-Mickael Laventure
1de35edb56 Document new /system/df and /{containers,volumes,images}/prune API EndPoints 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: a860d5db451f4cab4e49a831139ddcf554de52a2
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
Misty Stanley-Jones
54d60e9c2d Revert "Add direct link to event chart image" 
This reverts commit 86de72fef244b3fe209e5793deb40fb26f5b318e.

The link seems malformed and is breaking the overall docs build.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 23207def7c4a390fe3549f467413c187cc146fee
Component: engine
 2016-09-29 10:16:41 -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
be83d1256c Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress 
make client side know container removal in progress
Upstream-commit: 97d4b9c46528c2d263a448658a6cf78ffd943075
Component: engine
 2016-09-27 18:48:03 +02: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
Vincent Demeester
cc821d1b32 Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty 
add endpoint mode in service pretty
Upstream-commit: c505486bb195a3a413bacff7cfdee8d6931d529f
Component: engine
 2016-09-27 18:28:43 +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
allencloud
672761b64e make client side know container removal in progress 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9a58f298d182945eb2b820e5e3539b754fdaa751
Component: engine
 2016-09-27 18:06:54 +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
6352e3e776 API return network-list if no network-name or id is provided 
When calling the /networks/ endpoint with a trailing
slash, the default network was returned.

This changes the endpoint to return the list of networks
instead (same response as `/networks` without trailing
slash).

Also updated the description for GetNetworkByName to
explain that the "default" network is returned if
no name or id is provided.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6ad4bf0a533f8851b0ddccb56fe3b457819f6146
Component: engine
 2016-09-26 21:44:34 +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
Vincent Demeester
a0b2adc110 Merge pull request #26516 from yongtang/26453-build-bad-syntax 
Check bad syntax on dockerfile before building.
Upstream-commit: 72f556a9ff1043a4188e8eeef892d8a0ba4fe34f
Component: engine
 2016-09-23 12:24:20 +02: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
Sebastiaan van Stijn
b4a97d150a Add missing API docs for "privileged" and "user" exec 
The "user" feature was added in docker 1.7.0, and
"privileged" feature was added in docker 1.9.0
only contained CLI docs.

This adds the missing API docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c53efdf4c1f0b2e7f1fe04294d9d64401b8b09b8
Component: engine
 2016-09-22 23:40:05 +02:00
Yong Tang
9e4c8c252a Update documentation and change log to include the preliminary validation of dockerfile. 
This commit updates documentation and change log to include
the preliminary validation of the dockerfile before instructions
in dockerfile is run one-by-one.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e33dea5b40a52c5dcda682a1a292584ae6bff00d
Component: engine
 2016-09-22 14:33:37 -07: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
Vincent Demeester
6b6c0bf977 Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers 
Remove engine-api leftovers
Upstream-commit: d9aec43a16bb62f4804c78c8d368918a2fbcdbfb
Component: engine
 2016-09-22 09:39:27 +02: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
Sebastiaan van Stijn
7c1d86c305 Removed engine-api leftovers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 45818d6fc49e6da0369a33f015967fff7417df1c
Component: engine
 2016-09-21 12:36:52 +02:00