toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,100 Commits 3 Branches 295 Tags
b52b42c8db63dbff819879d3f7cba2d9084fb892
Commit Graph

5100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
b52b42c8db 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>
Upstream-commit: 078cbc9c4b
Component: cli
 2018-03-06 15:43:53 -05:00
Daniel Nephin
dd7eb35a89 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>
Upstream-commit: baf65a5502
Component: cli
 2018-03-06 15:27:34 -05:00
Daniel Nephin
dcb7fd9dc1 dont prompt for github creds in unit test 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0f11a310fd
Component: cli
 2018-03-06 15:27:09 -05:00
Sebastiaan van Stijn
95d1804c11 Merge pull request #918 from dnephin/remove-testutil 
Remove testutil
Upstream-commit: 0c75f522b6
Component: cli
 2018-03-06 21:19:26 +01:00
Daniel Nephin
6dbf483853 Remove testutil 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 681c921528
Component: cli
 2018-03-06 14:38:35 -05:00
Daniel Nephin
1e7a21de7c Merge pull request #917 from dnephin/cleanup-test-configfile 
Don't set a default filename for ConfigFile
Upstream-commit: c969e1e0b3
Component: cli
 2018-03-06 14:37:28 -05:00
Daniel Nephin
2625498b94 Cleanup config load error handling 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 789acb526c
Component: cli
 2018-03-06 13:44:06 -05:00
Daniel Nephin
a6a881dbc7 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>
Upstream-commit: 7c8b5708eb
Component: cli
 2018-03-06 13:32:50 -05:00
Sebastiaan van Stijn
e38d9c1064 Merge pull request #879 from dnephin/update-assertions 
Replace testify assertions with gotestyourself/assert
Upstream-commit: a0b19f0ec2
Component: cli
 2018-03-06 17:19:51 +01:00
Sebastiaan van Stijn
bccba2fc33 Merge pull request #916 from dnephin/use-client-with-ops 
Use new APIClient interface
Upstream-commit: fe067a0877
Component: cli
 2018-03-06 15:01:42 +01:00
Daniel Nephin
146b9fed38 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>
Upstream-commit: 5155cda716
Component: cli
 2018-03-05 19:41:17 -05:00
Daniel Nephin
ad1a2c9e1d Automated migration 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 39c2ca57c1
Component: cli
 2018-03-05 19:41:17 -05:00
Daniel Nephin
40f9f0a5c0 Replace testify vendor with updated gotestyourself 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5ef8835f23
Component: cli
 2018-03-05 19:41:14 -05:00
Daniel Nephin
9ccbb57610 Update some assertions. 
and fix some tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 93615dd967
Component: cli
 2018-03-05 17:15:24 -05:00
Daniel Nephin
d8679c544e Use new APIClient interface 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cff874122c
Component: cli
 2018-03-05 16:34:22 -05:00
Sebastiaan van Stijn
060165553c Merge pull request #911 from vdemeester/update-gotestyourself 
Update gotestyourself dependency
Upstream-commit: c26f37c0cc
Component: cli
 2018-02-28 18:07:37 +01:00
Daniel Nephin
c2ab7d89c3 Merge pull request #912 from kkirsche/patch-1 
Fix grammar typo in comment
Upstream-commit: 60dcc4cdfb
Component: cli
 2018-02-28 11:58:01 -05:00
Kevin Kirsche
e11e04d02b 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>
Upstream-commit: 0e2fdc92ce
Component: cli
 2018-02-28 11:29:40 -05:00
Vincent Demeester
919ca49c30 Update gotestyourself dependency 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 98ba439f67
Component: cli
 2018-02-28 16:11:02 +01:00
Vincent Demeester
7c89f9b56b Merge pull request #909 from LydellManganti/LydellManganti-patch-1 
Update run.md --restart to include unless-stopped
Upstream-commit: c19b272c09
Component: cli
 2018-02-28 14:53:49 +01:00
Lydell Manganti
63f4daf361 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>
Upstream-commit: d281b72a98
Component: cli
 2018-02-28 21:05:30 +10:00
Sebastiaan van Stijn
1d9d1d8c5e Merge pull request #907 from dnephin/add-more-container-copy-tests 
Add more container cp tests
Upstream-commit: c9303404d4
Component: cli
 2018-02-28 11:12:56 +01:00
Daniel Nephin
697a64b33e Add more container cp tests 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 07cb69e9bc
Component: cli
 2018-02-27 16:38:02 -05:00
Sebastiaan van Stijn
be84720c48 Merge pull request #139 from shhsu/v3_credhelper 
Silent login: use credentials from cred store to login
Upstream-commit: 2cc6ff131d
Component: cli
 2018-02-27 19:08:53 +01:00
Vincent Demeester
afdaedaad3 Merge pull request #904 from vdemeester/fix-run-label-flag-behavior 
Fix `--label` behavior on run
Upstream-commit: a9c6c52dc0
Component: cli
 2018-02-27 19:07:24 +01:00
Vincent Demeester
37ba7892be Merge pull request #898 from silvin-lubecki/add-stack-to-version-command 
Print Stack API and Kubernetes versions in version command
Upstream-commit: 2851c007fe
Component: cli
 2018-02-27 17:14:55 +01:00
Vincent Demeester
70e2992847 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>
Upstream-commit: 31dc5c0a9a
Component: cli
 2018-02-27 12:14:07 +01:00
Vincent Demeester
b1748ad25c Merge pull request #893 from adshmh/add-support-for-mandatory-variables-syntax-to-stack-deploy 
add support for mandatory variables to stack deploy
Upstream-commit: 750b038707
Component: cli
 2018-02-27 10:25:22 +01:00
Arash Deshmeh
38e7824f05 fix the error message in Substitute function 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 5d8ce59a25
Component: cli
 2018-02-26 15:29:17 -05:00
Arash Deshmeh
bb11b4e9b1 Added error message check to TestMandatoryVariableErrors test 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: e33bc48752
Component: cli
 2018-02-26 15:29:17 -05:00
Daniel Nephin
41c5444dac Refactor substitute to reduce cyclo complexity 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ce544823b6
Component: cli
 2018-02-26 15:29:17 -05:00
Arash Deshmeh
99c3d5bb04 added support for mandatory variables to cli/compose 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 99ecf57c6c
Component: cli
 2018-02-26 15:29:17 -05:00
Sebastiaan van Stijn
8fee7710b7 Merge pull request #900 from AkihiroSuda/sctp-doc 
docs: mention sctp
Upstream-commit: 2813fae8f9
Component: cli
 2018-02-26 11:28:44 +01:00
Sebastiaan van Stijn
f49d1f63d7 Merge pull request #901 from thaJeztah/bump-version-to-v18.04-dev 
Bump VERSION to 18.04.0-dev
Upstream-commit: 71039d0486
Component: cli
 2018-02-26 11:25:43 +01:00
Sebastiaan van Stijn
9f5c7766d0 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>
Upstream-commit: 06dd62ab1e
Component: cli
 2018-02-26 11:06:07 +01:00
Akihiro Suda
faa59fb288 docs: mention sctp 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: b85d87b8ab
Component: cli
 2018-02-26 15:27:11 +09:00
Silvin Lubecki
d3e338ece5 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>
Upstream-commit: 854aad8927
Component: cli
 2018-02-26 01:16:49 +01:00
shhsu@microsoft.com
1b83ee58c9 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>
Upstream-commit: 8883cd636a
Component: cli
 2018-02-22 09:14:51 -08:00
Vincent Demeester
9963a034b3 Merge pull request #896 from thaJeztah/templated-configs-secrets 
Add --template-driver option for secrets/configs
Upstream-commit: ef7d8be86c
Component: cli
 2018-02-22 09:44:16 +01:00
Sebastiaan van Stijn
acea77d537 Merge pull request #843 from sepich/docs-for-pr33130 
Document long form of --network and --network-add
Upstream-commit: 84c7dd6057
Component: cli
 2018-02-21 23:26:39 +01:00
Sebastiaan van Stijn
3b6356337c Add --template-driver option for secrets/configs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d11b5ccdfa
Component: cli
 2018-02-21 23:22:32 +01:00
Sebastiaan van Stijn
706ded458f Merge pull request #897 from thaJeztah/update-authors2 
Update authors
Upstream-commit: 50b229f533
Component: cli
 2018-02-21 21:28:36 +01:00
Sebastiaan van Stijn
da1330b479 Update authors 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ec92c08874
Component: cli
 2018-02-21 20:53:40 +01:00
Daniel Nephin
f8157dd468 Merge pull request #884 from shin-/update_3.6_schema_id 
Fix typo in 3.6 schema ID
Upstream-commit: 0e81cddd95
Component: cli
 2018-02-21 14:49:43 -05:00
Joffrey F
86c5b9760f Fix typo in 3.6 schema ID 
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 56f26d1134
Component: cli
 2018-02-21 19:55:12 +01:00
Daniel Nephin
da2e766ea9 Merge pull request #824 from ethan-haynes/820-bind-mount-source-missing-error 
added check for empty source in bind mount
Upstream-commit: cea4d37bca
Component: cli
 2018-02-21 13:33:24 -05:00
Daniel Nephin
6e4091ce84 Merge pull request #894 from thaJeztah/update-moby 
Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541
Upstream-commit: a160ad89c9
Component: cli
 2018-02-21 13:15:58 -05:00
Sebastiaan van Stijn
8878228a1f Merge pull request #895 from vdemeester/simplify-yaml-marshal 
Simplify the marshaling of compose types.Config
Upstream-commit: 88ee1a67f4
Component: cli
 2018-02-21 19:02:04 +01:00
Sebastiaan van Stijn
8254c65c9b Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541 
Includes:

- [client] Remove duplicate NewClient functions
- Add API support for templated secrets and configs
- Adjust minimum API version for templated configs/secrets

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 60930d309c
Component: cli
 2018-02-21 18:48:42 +01:00
Vincent Demeester
239936c7e1 Simplify the marshaling of compose types.Config 
- Add `Version` to `types.Config`
- Add a new `Services` types (that is just `[]ServiceConfig`) and add
  `MarshalYAML` method on it.
- Clean other top-level custom marshaling as `Services` is the only one
  required.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cf86a4d922
Component: cli
 2018-02-21 18:47:10 +01:00