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

5108 Commits

Author SHA1 Message Date
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
Vincent Demeester facb22573d
Add appveyor setup to build and unit test 
Adds a `make.ps1` powershell script to make it easy to compile and test.

```
.\scripts\make.ps1 -Binary
INFO: make.ps1 starting at 03/01/2018 14:37:28
INFO: Building...

 ________   ____  __.
 \_____  \ |    |/ _|
 /   |   \|      <
 /    |    \    |  \
 \_______  /____|__ \
         \/        \/

INFO: make.ps1 ended at 03/01/2018 14:37:30

.\scripts\make.ps1 -TestUnit
```

The next step is to run e2e tests on windows too.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-07 18:14:10 +01:00
Daniel Nephin 0e3677ead5
Merge pull request #921 from dnephin/use-canonical-imports 
testing: Use canonical asserts
 2018-03-07 12:00:34 -05:00
Sebastiaan van Stijn 485a01fb53
Merge pull request #920 from dnephin/fix-image-build-github 
Don't prompt for github creds in unit test
 2018-03-07 14:22:52 +01:00
Sebastiaan van Stijn f351f00f9e
Merge pull request #914 from justincormack/notaryup 
Update Notary vendor to 0.6.0 release
 2018-03-07 10:38:53 +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 f21276575f manual clean of asserts 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 15:49:00 -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 0f11a310fd dont prompt for github creds in unit test 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 15:27:09 -05:00
Sebastiaan van Stijn 0c75f522b6
Merge pull request #918 from dnephin/remove-testutil 
Remove testutil
 2018-03-06 21:19:26 +01:00
Daniel Nephin 681c921528 Remove testutil 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 14:38:35 -05:00
Daniel Nephin c969e1e0b3
Merge pull request #917 from dnephin/cleanup-test-configfile 
Don't set a default filename for ConfigFile
 2018-03-06 14:37:28 -05:00
Daniel Nephin 789acb526c Cleanup config load error handling 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 13:44:06 -05:00
Daniel Nephin 7c8b5708eb Don't set a default filename for ConfigFile 
With a default filename tests will leave a file in the working directory
that is never cleaned up.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 13:32:50 -05:00
Sebastiaan van Stijn a0b19f0ec2
Merge pull request #879 from dnephin/update-assertions 
Replace testify assertions with gotestyourself/assert
 2018-03-06 17:19:51 +01:00
Sebastiaan van Stijn fe067a0877
Merge pull request #916 from dnephin/use-client-with-ops 
Use new APIClient interface
 2018-03-06 15:01:42 +01: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 5ef8835f23 Replace testify vendor with updated gotestyourself 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 19:41:14 -05:00
Daniel Nephin 93615dd967 Update some assertions. 
and fix some tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 17:15:24 -05:00
Daniel Nephin cff874122c Use new APIClient interface 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 16:34:22 -05:00
Justin Cormack 9da428da2e
Update Notary vendor to 0.6.0 release 
We were on a slightly earlier random commit.

We should try to stay on releases where possible...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2018-03-02 14:56:12 +00:00
Sebastiaan van Stijn c26f37c0cc
Merge pull request #911 from vdemeester/update-gotestyourself 
Update gotestyourself dependency
 2018-02-28 18:07:37 +01:00
Daniel Nephin 60dcc4cdfb
Merge pull request #912 from kkirsche/patch-1 
Fix grammar typo in comment
 2018-02-28 11:58:01 -05:00
Kevin Kirsche 0e2fdc92ce
Fix grammar typo in comment 
Overriding is the incorrect part of speech for this sentence. It is more common to state that the values are overridden instead.

Other options would include:

```golang
// ldflags is overriding these values
```

```golang
// These values will be overridden by ldflags
```

etc.

Signed-off-by: Kevin Kirsche <kevin.kirsche@verizon.com>
 2018-02-28 11:29:40 -05:00
Vincent Demeester 98ba439f67
Update gotestyourself dependency 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-02-28 16:11:02 +01:00
Vincent Demeester c19b272c09
Merge pull request #909 from LydellManganti/LydellManganti-patch-1 
Update run.md --restart to include unless-stopped
 2018-02-28 14:53:49 +01:00
Lydell Manganti d281b72a98 Update run.md --restart to include unless-stopped 
Update --restart option to include unless-stopped to be consistent with https://docs.docker.com/config/containers/start-containers-automatically/#use-a-restart-policy

Signed-off-by: Lydell Manganti <lydell.manganti@gmail.com>
 2018-02-28 21:05:30 +10:00
Sebastiaan van Stijn c9303404d4
Merge pull request #907 from dnephin/add-more-container-copy-tests 
Add more container cp tests
 2018-02-28 11:12:56 +01: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
Sebastiaan van Stijn 2cc6ff131d
Merge pull request #139 from shhsu/v3_credhelper 
Silent login: use credentials from cred store to login
 2018-02-27 19:08:53 +01:00
Vincent Demeester a9c6c52dc0
Merge pull request #904 from vdemeester/fix-run-label-flag-behavior 
Fix `--label` behavior on run
 2018-02-27 19:07:24 +01:00
Vincent Demeester 2851c007fe
Merge pull request #898 from silvin-lubecki/add-stack-to-version-command 
Print Stack API and Kubernetes versions in version command
 2018-02-27 17:14:55 +01: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 750b038707
Merge pull request #893 from adshmh/add-support-for-mandatory-variables-syntax-to-stack-deploy 
add support for mandatory variables to stack deploy
 2018-02-27 10:25:22 +01:00
Arash Deshmeh 5d8ce59a25 fix the error message in Substitute function 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2018-02-26 15:29:17 -05:00
Arash Deshmeh e33bc48752 Added error message check to TestMandatoryVariableErrors test 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2018-02-26 15:29:17 -05:00
Daniel Nephin ce544823b6 Refactor substitute to reduce cyclo complexity 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-26 15:29:17 -05:00
Arash Deshmeh 99ecf57c6c added support for mandatory variables to cli/compose 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2018-02-26 15:29:17 -05:00
Sebastiaan van Stijn 2813fae8f9
Merge pull request #900 from AkihiroSuda/sctp-doc 
docs: mention sctp
 2018-02-26 11:28:44 +01:00
Sebastiaan van Stijn 71039d0486
Merge pull request #901 from thaJeztah/bump-version-to-v18.04-dev 
Bump VERSION to 18.04.0-dev
 2018-02-26 11:25:43 +01:00
Sebastiaan van Stijn 06dd62ab1e
Bump VERSION to 18.04.0-dev 
The Docker 18.03 branch was cut from

CLI:    84c7dd6057
Engine: fb005971c2bd82de482d1cfe924f2f4ec60c60ae

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-26 11:06:07 +01:00
Akihiro Suda b85d87b8ab docs: mention sctp 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-02-26 15:27:11 +09:00
Silvin Lubecki 854aad8927 Print Stack API version in version command 
* Resolve Stack API using Kubernetes discovering API
* Refactor Kubernetes flags parsing

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
 2018-02-26 01:16:49 +01:00
shhsu@microsoft.com 8883cd636a Silent login: if user did not provide -u and -p flag for login command but both username and password are retrieved in cred store, docker will automatically use the credentials found in the cred store to log in 
Signed-off-by: shhsu@microsoft.com <shhsu@microsoft.com>
Signed-off-by: Peter Hsu <shhsu@microsoft.com>
Signed-off-by: shhsu <shhsu@microsoft.com>
Signed-off-by: Peter Hsu <shhsu@microsoft.com>
 2018-02-22 09:14:51 -08:00
Vincent Demeester ef7d8be86c
Merge pull request #896 from thaJeztah/templated-configs-secrets 
Add --template-driver option for secrets/configs
 2018-02-22 09:44:16 +01:00
Sebastiaan van Stijn 84c7dd6057
Merge pull request #843 from sepich/docs-for-pr33130 
Document long form of --network and --network-add
 2018-02-21 23:26:39 +01:00
Sebastiaan van Stijn d11b5ccdfa
Add --template-driver option for secrets/configs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-21 23:22:32 +01:00
Sebastiaan van Stijn 50b229f533
Merge pull request #897 from thaJeztah/update-authors2 
Update authors
 2018-02-21 21:28:36 +01:00