toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,418 Commits 3 Branches 295 Tags
4e81e4fa4edce70d1ce4e96c2181fcdfb88241bb
Commit Graph

38418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eli Uriegas
4e81e4fa4e Blacklist tests, will be rewritten later on 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-09-30 13:23:18 -07:00
Andrew Hsu
8a6c4c93b6 Merge pull request #261 from seemethere/ensure_channel 
[17.10] ensure channel is allocated
 2017-09-30 09:36:10 -07:00
Stephen J Day
7b99808cac cli/command/container: ensure channel is allocated 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit e78772af4d)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-09-29 18:14:51 -07:00
Andrew Hsu
328a5917ad Merge component 'engine' from git@github.com:moby/moby master 2017-09-29 22:30:27 +00:00
Andrew Hsu
09bc512154 Merge component 'cli' from git@github.com:docker/cli master 2017-09-29 22:08:57 +00:00
Sebastiaan van Stijn
4b8b813d22 Merge pull request #570 from thaJeztah/bump-moby-vendor 
Bump moby vendor to 14ce1f1cf48e9859223c6311de58aec4dc
Upstream-commit: 31908a4b45
Component: cli
 2017-09-29 23:08:16 +02:00
Victor Vieux
0e6592d05e Merge pull request #572 from thaJeztah/bump-vendor-for-powerpc 
revendor logrus and x/crypto
Upstream-commit: 00cc728dfb
Component: cli
 2017-09-29 13:58:38 -07:00
Tõnis Tiigi
4c4e74cebe Merge pull request #35042 from pradipd/panic_fix 
Fixing panic when sandbox is nil
Upstream-commit: ab2b03a0e139537376bbf66c1e1e9e897a403f06
Component: engine
 2017-09-29 12:51:55 -07:00
Pradip Dhara
28e35b96d0 Fixing panic when sandbox is nil 
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
Upstream-commit: c4ad0747e929a41ecec7e8c2ae2bd0cc037401ed
Component: engine
 2017-09-29 09:23:06 -07:00
Sebastiaan van Stijn
c9fbb737e9 Fixes for updated dependencies 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0082310aa5
Component: cli
 2017-09-29 17:45:31 +02:00
Sebastiaan van Stijn
c9e8020d97 bump moby/moby and dependencies to 14ce1f1cf48e9859223c6311de58aec4dc0f046c 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 98dbfeee76
Component: cli
 2017-09-29 17:44:49 +02:00
Sebastiaan van Stijn
0b195d3e47 Merge pull request #571 from thaJeztah/bump-vndr 
Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
Upstream-commit: 107f6c6ab2
Component: cli
 2017-09-29 17:39:21 +02:00
Sebastiaan van Stijn
6230f06c47 revendor logrus and x/crypto 
updates to the same version as is currently used
on moby/moby; this bump contains fixes for ppc64le.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e3b7700fb9
Component: cli
 2017-09-29 15:32:42 +02:00
Sebastiaan van Stijn
5edb9ec08c Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384 
Includes a fix to cleanup unused vendor-directories

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 368b639e7e
Component: cli
 2017-09-29 14:58:05 +02:00
Akihiro Suda
907b966c7e Merge pull request #35029 from fntlnz/builder/cleaning 
Cleaning dead code out of the builder
Upstream-commit: de6cb7ab848d6131634e40d21d30bf2fe183e9a3
Component: engine
 2017-09-29 16:28:02 +09:00
Lorenzo Fontana
4034b44eca Cleaning dead code out of the builder 
Signed-off-by: Lorenzo Fontana <lo@linux.com>
Upstream-commit: dff2a23749a6b7c949146d7850f514cd74e3a8d7
Component: engine
 2017-09-29 02:55:35 +02:00
Yong Tang
80c3ad8db1 Merge pull request #35008 from yujuhong/cli-version 
Fix version comparison when negotiating the the API version
Upstream-commit: 14ce1f1cf48e9859223c6311de58aec4dc0f046c
Component: engine
 2017-09-28 11:58:50 -10:00
Sebastiaan van Stijn
d62e09de17 Merge pull request #35025 from Microsoft/jjh/TestRunAttachFailedNoLeak 
Windows: RS3: Temporarily disable TestRunAttachFailedNoLeak
Upstream-commit: 048ef0db6a75898aee57bf725ed64940744cd938
Component: engine
 2017-09-28 21:59:32 +02:00
Daniel Nephin
5fe53bab44 Merge pull request #565 from thaJeztah/change-stats-format 
Change default stats format and add --no-trunc flag
Upstream-commit: 64d5c32b8e
Component: cli
 2017-09-28 15:14:43 -04:00
Andrew Hsu
ae273c63d1 Merge component 'engine' from git@github.com:moby/moby master 2017-09-28 10:34:35 -07:00
John Howard
4330196b5a Windows: RS3: Temporarily disable TestRunAttachFailedNoLeak 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9e587fa72b8cc42895681efe3d0b9fdcdfe3b06d
Component: engine
 2017-09-28 10:15:58 -07:00
Tõnis Tiigi
e25514ef0c Merge pull request #35004 from thaJeztah/dont-warn-for-comment-only-lines 
Warn on empty continuation lines only, not on comment-only lines
Upstream-commit: 94b987043ffd372aad49dfc51c3be2c2f6cff97f
Component: engine
 2017-09-28 08:56:30 -07:00
Vincent Demeester
d6eb3e21a4 Merge pull request #35007 from seemethere/fix_service_detach_tests 
Explicitly add --detach to service CLI calls
Upstream-commit: 5a4841079bc247937e6ed1042ab24ffd01a8547c
Component: engine
 2017-09-28 11:17:14 +02:00
Yu-Ju Hong
747a47b477 Fix version comparison when negotiating the the API version 
Signed-off-by: Yu-Ju Hong <yjhong@google.com>
Upstream-commit: 4b6ec10b07c14e7fff1cc51156b6d954147f826f
Component: engine
 2017-09-27 18:42:02 -07:00
Victor Vieux
d7aeee3eda remove --detach on scale 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 0ad0294124badebe0d9a73f1b7e2f030e4a24e2b
Component: engine
 2017-09-27 17:47:51 -07:00
Victor Vieux
8d23cb5213 Merge pull request #34966 from AkihiroSuda/seccomp 
Dockerfile: use seccomp provided by stretch
Upstream-commit: aa02e2b7bc1f5f4b921f64337e4f6d1cf7aa8fe4
Component: engine
 2017-09-27 16:21:55 -07:00
Eli Uriegas
ca5a5c5ca1 Explicitly add --detach to service CLI calls 
The behavior of service (create/update/scale) was changed in a recent PR
to docker/cli. This commit serves to remedy test failures experienced
when attempting to use service calls.

Should not affect current behavior.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: e5b3ebbc649e4b1a10d4cdca342a153c301ec225
Component: engine
 2017-09-27 16:17:55 -07:00
Sebastiaan van Stijn
f6d296e26e Warn on empty continuation lines only, not for comments 
Commit 8d1ae76dcbbb73d8e20c6a14a7d3fe2410b95f55 added
deprecation warnings for empty continuation lines,
but also treated comment-only lines as empty.

This patch distinguishes empty continuation lines
from comment-only lines, and only outputs warnings
for the former.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2fd736ac10c1c46d1001373d887cb99b3d8ee824
Component: engine
 2017-09-28 00:11:10 +02:00
Sebastiaan van Stijn
00bb761ead Merge pull request #34990 from pradipd/update_field_name 
Update field name
Upstream-commit: 853df8f32bf560428fdc39dfd9bfa7bb7c610346
Component: engine
 2017-09-27 20:00:18 +02:00
Andrew Hsu
747646833d Merge component 'engine' from git@github.com:moby/moby master 2017-09-27 10:25:04 -07:00
Sebastiaan van Stijn
b4a6a3d358 Add --no-trunc option to docker container stats 
This patch adds a `--no-trunc` option to `docker container stats`;

With this patch applied, the default output is:

    CONTAINER ID        NAME                                    CPU %               MEM USAGE / LIMIT     MEM %               NET I/O             BLOCK I/O           PIDS
    b95a83497c91        awesome_brattain                        0.28%               5.629MiB / 1.952GiB   0.28%               916B / 0B           147kB / 0B          9
    67b2525d8ad1        foobar                                  0.00%               1.727MiB / 1.952GiB   0.09%               2.48kB / 0B         4.11MB / 0B         2
    e5c383697914        test-1951.1.kay7x1lh1twk9c0oig50sd5tr   0.00%               196KiB / 1.952GiB     0.01%               71.2kB / 0B         770kB / 0B          1
    4bda148efbc0        random.1.vnc8on831idyr42slu578u3cr      0.00%               1.672MiB / 1.952GiB   0.08%               110kB / 0B          578kB / 0B          2
    84e3deaa45b2        registry                                0.01%               3.402MiB / 1.952GiB   0.17%               127kB / 378B        233kB / 0B          10
    2ed915778ceb        foo.1.lsmxrefn5yp9c9ijz1hzgdq4u         0.00%               1.727MiB / 1.952GiB   0.09%               166kB / 7.76kB      614kB / 0B          2

Addin the `--no-trunc` option, changes the output to:

    CONTAINER ID                                                       NAME                                    CPU %               MEM USAGE / LIMIT     MEM %               NET I/O             BLOCK I/O           PIDS
    b95a83497c9161c9b444e3d70e1a9dfba0c1840d41720e146a95a08ebf938afc   awesome_brattain                        0.25%               5.75MiB / 1.952GiB    0.29%               648B / 0B           147kB / 0B          10
    67b2525d8ad10bb236a49960e93c09993b0baabeef12c2d46cd5f4fbb6f4808c   foobar                                  0.00%               1.727MiB / 1.952GiB   0.09%               2.35kB / 0B         4.11MB / 0B         2
    e5c383697914b98b10cbbc9d0bd324b7b927099ac584f031057b8208d2fba9b1   test-1951.1.kay7x1lh1twk9c0oig50sd5tr   0.00%               196KiB / 1.952GiB     0.01%               71.1kB / 0B         770kB / 0B          1
    4bda148efbc006b0063373c3678083159af89f8cc83a6a28def14cb0dd171f70   random.1.vnc8on831idyr42slu578u3cr      0.00%               1.672MiB / 1.952GiB   0.08%               110kB / 0B          578kB / 0B          2
    84e3deaa45b2fc363e06167df9b90ab59f88d4f101e3f9b8df03a62a8f6783e1   registry                                0.00%               3.387MiB / 1.952GiB   0.17%               127kB / 378B        233kB / 0B          10
    2ed915778cebddf9ec69263a75cfdcf00962a5198d94d42cda75d5cd45bb82f2   foo.1.lsmxrefn5yp9c9ijz1hzgdq4u         0.00%               1.727MiB / 1.952GiB   0.09%               166kB / 7.76kB      614kB / 0B          2

Which is the same as the default before this patch was applied.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e63417a9c0
Component: cli
 2017-09-27 18:59:25 +02:00
Andrew Hsu
915d4f9741 Merge component 'cli' from git@github.com:docker/cli master 2017-09-27 09:23:02 -07:00
Sebastiaan van Stijn
a58b05b91c Update default output format for stats to include ID and Name 
The `docker container stats` output has a column (`CONTAINER`), that shows either
the container _id_ or container _name_, depending on the arguments given.

For example, running `docker container stats foobar` shows:

    CONTAINER           CPU %               MEM USAGE / LIMIT     MEM %               NET I/O             BLOCK I/O           PIDS
    foobar              0.00%               1.938MiB / 1.952GiB   0.10%               782B / 0B           4.11MB / 0B         2

Whereas `docker container stats 67b2525d8ad1` (`67b2525d8ad1` being the ID for
container `foobar`) shows:

    CONTAINER           CPU %               MEM USAGE / LIMIT     MEM %               NET I/O             BLOCK I/O           PIDS
    67b2525d8ad1        0.00%               1.938MiB / 1.952GiB   0.10%               916B / 0B           4.11MB / 0B         2

This behavior is confusing.

This patch updates the default output format for `docker stats` to use separate
columns for container ID and container Name (similar to `docker container ls`).

With this patch applied, both commands show the same output:

    $ docker container stats foobar
    CONTAINER ID                                                       NAME                CPU %               MEM USAGE / LIMIT     MEM %               NET I/O             BLOCK I/O           PIDS
    67b2525d8ad10bb236a49960e93c09993b0baabeef12c2d46cd5f4fbb6f4808c   foobar              0.00%               1.938MiB / 1.952GiB   0.10%               1.25kB / 0B         4.11MB / 0B         2

    $ docker container stats 67b2525d8ad1
    CONTAINER ID                                                       NAME                CPU %               MEM USAGE / LIMIT     MEM %               NET I/O             BLOCK I/O           PIDS
    67b2525d8ad10bb236a49960e93c09993b0baabeef12c2d46cd5f4fbb6f4808c   foobar              0.00%               1.938MiB / 1.952GiB   0.10%               1.31kB / 0B         4.11MB / 0B         2

Users that want to use the old format can configure a custom format in the
cli configuration file (`~/.docker/config.json`);

on Linux:

    {
      "statsFormat" : "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}\t{{.MemPerc}}\t{{.NetIO}}\t{{.BlockIO}}\t{{.PIDs}}"
    }

on Windows:

    {
      "statsFormat" : "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}\t{{.NetIO}}\t{{.BlockIO}}"
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0a78472211
Component: cli
 2017-09-27 18:05:51 +02:00
Kenfe-Mickaël Laventure
4d03073a2c Merge pull request #34811 from yongtang/runc 
Update runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d
Upstream-commit: 502eddb9859dcd30ce46732b24cefe49cf1ccbd1
Component: engine
 2017-09-27 08:44:43 -07:00
Sebastiaan van Stijn
d14643fb47 Merge pull request #34792 from runcom/fix-relabel-symlinks 
volume: evaluate symlinks before relabeling mount source
Upstream-commit: f60e7aac62a14907132aa5c3bc9d5cf5ca0e6ebc
Component: engine
 2017-09-27 17:42:23 +02:00
Sebastiaan van Stijn
240408899b Merge pull request #34928 from darrenstahlmsft/HnsRunning 
Ensure Host Network Service exists
Upstream-commit: 6af60b3c6180817e06ce87d562643b442a866502
Component: engine
 2017-09-27 17:35:08 +02:00
Vincent Demeester
4262667057 Merge pull request #34985 from thaJeztah/remove-use-of-deprecated-filter-functions 
Remove use of deprecated filter functions
Upstream-commit: a343cba40c25deb2893e13f9a81dbcc4d19d16e2
Component: engine
 2017-09-27 17:34:07 +02:00
Sebastiaan van Stijn
7ed1303eb4 Merge pull request #34881 from ityangchen/test-moby 
"docker swarm init --force-new-cluster" use limit
Upstream-commit: 0b968f91958eea12c2fa82cec64790cb03367232
Component: engine
 2017-09-27 14:11:46 +02:00
Vincent Demeester
689b8ff233 Merge pull request #562 from dnephin/update-gometalinter 
Update gometalinter
Upstream-commit: feb4d79935
Component: cli
 2017-09-27 09:42:37 +02:00
Vincent Demeester
5a67fa7a37 Merge pull request #563 from riyazdf/remove-extra-options 
trust: remove extraneous OPTIONS from commands that do not use it
Upstream-commit: e27e07a8a9
Component: cli
 2017-09-27 09:41:33 +02:00
Riyaz Faizullabhoy
bb1eca37a9 trust: remove extraneous OPTIONS from commands that do not use it 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 9ad0e8f223
Component: cli
 2017-09-26 16:15:45 -07:00
Pradip Dhara
e4f32567d3 Updating moby to correspond to naming convention used in https://github.com/docker/swarmkit/pull/2385 
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
Upstream-commit: d00a07b1e6d46c3cc9ef95e8b6227115830e2701
Component: engine
 2017-09-26 22:08:10 +00:00
Pradip Dhara
fa385958f4 vndr swarmkit 941a01844b89c56aa61086fecb167ab3af1de22b 
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
Upstream-commit: 8e15b1cffb95d1e82943a628353c6df7cd54f6c4
Component: engine
 2017-09-26 22:08:10 +00:00
Sebastiaan van Stijn
23c421f3c5 Merge pull request #557 from allencloud/add-more-event-filter-type 
Add more event filters in doc: config, node, secret and service
Upstream-commit: 62d62ff513
Component: cli
 2017-09-26 22:48:22 +02:00
Sebastiaan van Stijn
de74f6b50c Merge pull request #34952 from allencloud/add-specific-event-filter 
add node/service/secret/config specific event filter
Upstream-commit: afe31900915782daf67b40d405d8e7b8e01ab2dd
Component: engine
 2017-09-26 22:46:41 +02:00
Andrew Hsu
f99bd6dc82 Merge component 'engine' from git@github.com:moby/moby master 2017-09-26 12:50:25 -07:00
Daniel Nephin
dead314452 Refactor image commands to make use of the new trust struct for trusted pull 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4203b49431
Component: cli
 2017-09-26 15:15:42 -04:00
Victor Vieux
8a5301f81b Merge pull request #34911 from dnephin/new-ci-entrypoint 
Add a new entrypoint for CI
Upstream-commit: a971f9c9d7d1bdc69b197a82c3fb010681f5cd1f
Component: engine
 2017-09-26 11:50:44 -07:00
Andrew Hsu
1a654751d3 Merge component 'cli' from git@github.com:docker/cli master 2017-09-26 10:56:04 -07:00
Tõnis Tiigi
7fd47ecc0d Merge pull request #34961 from fcrisciani/libnetwork-vendoring 
Vendoring libnetwork
Upstream-commit: 37eb796ccb6de7def92f0ab3f18c686ae92ef29f
Component: engine
 2017-09-26 10:50:32 -07:00