Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,142 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

83 Commits

Author SHA1 Message Date
Vincent Demeester 8b00c5cfd8
Add more content trust tests 
Importing from moby's DockerTrustSuite tests.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-19 10:02:40 +01:00
Daniel Nephin feae0e9756 Only read trust setting from options 
Rename IsTrusted to ContentTrustEnabled

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-08 16:46:30 -05:00
Vincent Demeester 6e21829af4 Refactor content_trust cli/flags handling 
Remove the global variable used. Allows easier unit testing.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-08 15:00:43 -05:00
Vincent Demeester 0cf2e6353a
Fixes some unit tests to be able to run them on windows 
Some of them are skipped for now (because the feature is not supported
or needs more work), some of them are fixed.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-07 18:18:13 +01:00
Daniel Nephin e15b208e96 Convert assert.Check(t, is.Error()) to assert.Error 
git grep -l -P '^\s+assert\.Check\(t, is\.Error\(' | \
    xargs perl -pi -e 's/^(\s+assert\.)Check\(t, is\.Error\((.*)\)$/\1Error(t, \2/'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 16:00:28 -05:00
Daniel Nephin 078cbc9c4b Convert assert.Check with 
git grep -l -P '^\s+assert\.Check\(t, ' | \
    xargs perl -pi -e 's/^(\s+assert)\.Check(\(t, (?!is).*(\.Execute\(|\.Set\(|\.Write\(|\.Close\(|\.Untar\(|\.WriteFile\(|Validate\().*\)$)/\1.NilError\2/'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 15:43:53 -05:00
Daniel Nephin baf65a5502 Convert to assert.NilError 
Using:

  git grep -l '^\s\+assert\.Check(t, err)$' | \
    xargs sed -i -e 's/^\(\s\+assert\)\.Check(t, err)$/\1.NilError(t, err)/'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 15:27:34 -05:00
Daniel Nephin 681c921528 Remove testutil 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 14:38:35 -05:00
Daniel Nephin 5155cda716 Post migration fixes 
Fix tests that failed when using cmp.Compare()
internal/test/testutil/assert
InDelta
Fix DeepEqual with kube metav1.Time
Convert some ErrorContains to assert

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 19:41:17 -05:00
Daniel Nephin 39c2ca57c1 Automated migration 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 19:41:17 -05:00
Daniel Nephin 07cb69e9bc Add more container cp tests 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-27 16:38:02 -05:00
Vincent Demeester 31dc5c0a9a
Fix `--label` behavior on run 
Commit 2b17f4c8a8 fixed the way empty labels
are taken into account (i.e. not interpolated from environment variable),
but it created a regression.

`ValidateLabel` functions doesn't allow empty label value, but it has
always been possible to pass an empty label via the cli (`docker run --label foo`).

This fixes that by not validating the label flag.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-02-27 12:14:07 +01:00
Vincent Demeester 581b8d9d72
Add unit tests to docker container ls 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-02-19 11:22:36 +01:00
Vincent Demeester 2b17f4c8a8
Fix `--label-file` weird behavior 
`--label-file` has the exact same behavior as `--env-file`, meaning any
placeholder (i.e. a simple key, no `=` sign, no value), it will get the
value from the environment variable.

For `--label-file` it should just add an empty label.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-01-29 11:08:54 -08:00
Sebastiaan van Stijn 44a1168ae5
Merge pull request #696 from mlaventure/attach-use-containerwait 
attach: Use ContainerWait instead of Inspect
 2018-01-20 23:55:16 +01:00
Kir Kolyshkin 85ddaee5af container.waitExitOrRemoved(): add a test case 
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-01-16 10:16:28 -08:00
Kir Kolyshkin 8471742a8a Show container wait error 
If container wait has failed, show an error from the engine
and return an appropriate exit code.

This requires engine changes from https://github.com/moby/moby/pull/34999

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2017-12-15 14:15:30 -08:00
Nicolas De Loof 8dc88ea7b5
Annotate worker option for 1.35 API 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2017-12-06 17:24:01 +01:00
Nicolas De Loof 591a1273fd
introduce `—workdir` option for docker exec 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2017-12-06 17:24:01 +01:00
Kenfe-Mickael Laventure 66661761d5
attach: Use ContainerWait instead of Inspect 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-11-17 18:12:46 -08:00
Jamie Hannaford 0450a2f437 Add docs 
Signed-off-by: Jamie Hannaford <jamie@limetree.org>
 2017-11-14 18:04:10 +01:00
Jamie Hannaford 9c9303e113 add test for logs 
Signed-off-by: Jamie Hannaford <jamie@limetree.org>
 2017-11-13 10:57:44 +01:00
Jamie Hannaford 6f309316e2 Add new CLI option for --until 
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
 2017-11-10 12:38:08 +01:00
Sebastiaan van Stijn 042575aac9
Merge pull request #474 from jhowardmsft/jjh/apis-for-platform 
LCOW: CLI changes to add platform flag - pull, run, create and build
 2017-11-07 14:26:31 +01:00
John Howard d8b782560e LCOW: Add `--platform=` CLI flag to pull/create/run/build 
Signed-off-by: John Howard <jhoward@microsoft.com>

This is the CLI updates for the document discussed in https://github.com/moby/moby/issues/34617
to support Linux Containers on Windows. It adds --platform= as CLI flags to the four
commands listed above. Import still to be completed (needs daemon changes).
 2017-10-31 09:50:43 -07:00
Daniel Nephin b7b62ca26a Adding unit tests for cp 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-10-30 18:33:28 -04:00
Daniel Nephin c0d004f7cf Update gometalinter 
and enable the new WarnUnmatchedDirective to warn if a nolint is unnecessary.
remove some unnecessary nolint

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-10-26 12:21:02 -04:00
Daniel Nephin 4205416c9b Update code for upstream cobra 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-10-25 14:49:26 -04:00
Sebastiaan van Stijn 1401d5daf2 Merge pull request #620 from dnephin/add-nakedret-linter 
Add nakedret linter
 2017-10-13 14:54:00 +02:00
Daniel Nephin dbd96badb6 Add nakedret linter. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-10-12 11:48:51 -04:00
Sebastiaan van Stijn e56a58e4ed
Updates for updated moby version 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-10-12 01:02:10 +02:00
Stephen J Day e78772af4d
cli/command/container: ensure channel is allocated 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-09-29 18:12:03 -07:00
Sebastiaan van Stijn 0082310aa5
Fixes for updated dependencies 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-09-29 17:45:31 +02:00
Sebastiaan van Stijn e63417a9c0
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>
 2017-09-27 18:59:25 +02:00
Daniel Nephin d956386b2d Update gometalinter 
The update includes bug fixes in gometalinter and updates to linters, which
discovered more linter problems.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-09-26 12:33:35 -04:00
Simon Ferquel a0113c3a44 updated vendoring 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2017-09-01 19:41:06 -04:00
Daniel Nephin a0d8d80250 Fix crash in containe run after pulling an image. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-31 17:08:02 -04:00
Victor Vieux 8ea02f6f08 Merge pull request #477 from dnephin/some-tests-for-container-command 
A few tests for container command
 2017-08-30 09:38:38 -07:00
Daniel Nephin e7f90b6b38 Reduce complexity in cli/command/container 
Add tests for exec and cleanup existing tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-29 19:25:50 -04:00
Daniel Nephin dae1b7112c Remove test for code not in this repo. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-29 13:19:28 -04:00
Vincent Demeester 8ebc03a71f Merge pull request #367 from kolyshkin/ipcmode 
Introduce/document new IPC modes
 2017-08-25 09:48:00 +02:00
Daniel Nephin 846a31aa50 Use new internal testutil.ErrorContains() 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-22 10:14:25 -04:00
Daniel Nephin b3f843afe2 Move internal/test package out of cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-22 10:14:25 -04:00
Christophe Vidal 037029414d Dropped hyphen in bind mount where appropriate 
Signed-off-by: Christophe Vidal <kriss@krizalys.com>
 2017-08-19 21:14:48 +07:00
Vincent Demeester a6800f95fa
Import `docker/docker/pkg/templates` to cli 
This package will be deprecated/removed from `docker/docker/pkg` and
is mainly used for the cli format options. Let's import it and
maintain here.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-08-08 17:26:24 +02:00
Kir Kolyshkin 9285db6752 Introduce/document new IPC modes 
This builds (and depends) on https://github.com/moby/moby/pull/34087

Version 2:
 - remove --ipc argument validation (it is now done by daemon)
 - add/document 'none' value
 - docs/reference/run.md: add a table with better modes description
 - dockerd(8) typesetting fixes

Version 3:
 - remove ipc mode tests from cli/command/container/opts_test.go

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2017-08-05 17:49:53 -07:00
Daniel Nephin 42a3800783 Update some tests to remove unnecessary buffers. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-11 17:52:43 -04:00
Daniel Nephin 3da0cbfdd1 Remove unnecessary use of SetConfigfile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-11 14:49:30 -04:00
Daniel Nephin 69b142b52a Update FakeCli to remove duplication in tests. 
Use byte buffers by default, since that is what is done most of the time.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-11 14:49:30 -04:00
Yassine TIJANI 45b0e7cf1a fixing SIGSEGV when running containers 
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>

moving the deffering of the close after the error checking

Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>

fixing SIGSEGV when running containers

Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
 2017-07-06 18:57:36 +02:00