toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,165 Commits 3 Branches 295 Tags
311944ec0418b52e34eddd015127ec1d1dd69f18
Commit Graph
4932 Commits
Author SHA1 Message Date
Vincent Demeester 311944ec04 Small content trust enhancement 
- `replaceDockerfileForContentTrust` is only used when content trust is
  enabled, so remove the boolean.
- rename `isContentTrustEnabled` to `contentTrustEnabled`

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 63ebcae382)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 15:14:17 -07:00
Daniel Nephin ad89cb6a38 Only read trust setting from options 
Rename IsTrusted to ContentTrustEnabled

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit feae0e9756)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 15:12:02 -07:00
Vincent Demeester aba0bb77e1 Refactor content_trust cli/flags handling 
Remove the global variable used. Allows easier unit testing.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 6e21829af4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 15:07:03 -07:00
Daniel Nephin a20c69243b Cleanup config load error handling 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 789acb526c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 15:01:36 -07:00
Daniel Nephin bcb040440f 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>
(cherry picked from commit 7c8b5708eb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 15:01:20 -07:00
Daniel Nephin 2cc21bf56f Use new APIClient interface 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit cff874122c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 14:55:17 -07:00
Daniel Nephin a218857a9a 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>
(cherry picked from commit e15b208e96)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 14:48:48 -07:00
Daniel Nephin a723f7351d manual clean of asserts 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit f21276575f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 14:48:41 -07:00
Daniel Nephin df9ed934e3 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>
(cherry picked from commit 078cbc9c4b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 14:48:34 -07:00
Daniel Nephin f7124ab5e4 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>
(cherry picked from commit baf65a5502)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 14:48:09 -07:00
Daniel Nephin 9550f71467 dont prompt for github creds in unit test 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 0f11a310fd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 14:45:49 -07:00
Daniel Nephin 1f1816b098 Remove testutil 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 681c921528)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 14:40:48 -07:00
Daniel Nephin 7c2863a6e0 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>
(cherry picked from commit 5155cda716)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 14:33:18 -07:00
Daniel Nephin fb9700fdbd Automated migration 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 39c2ca57c1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 14:29:47 -07:00
Daniel Nephin 70083e56be Replace testify vendor with updated gotestyourself 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 5ef8835f23)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 13:54:23 -07:00
Daniel Nephin 659ea5343c Update some assertions. 
and fix some tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 93615dd967)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 13:54:15 -07:00
Vincent Demeester 49dc9b064e Update gotestyourself dependency 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 98ba439f67)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-04-10 12:12:52 -07:00
Eli Uriegas 95930e8794 bump version to 18.03.0-ce 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2018-03-21 17:59:46 +00:00
Andrew Hsu fbedb97a27 Merge pull request #464 from jose-bigio/18.03_versionBump 
[18.03] Version bump for 18.03-ce-rc4
 2018-03-15 00:28:45 -07:00
Andrew Hsu 7d9137fefc Merge pull request #461 from vdemeester/trust-updates 
[18.03] move trust out of experimental
 2018-03-14 10:23:54 -07:00
jose-bigio 9cc70ae1b0 Version bump for 18.03-ce-rc4 
Signed-off-by: jose-bigio <jose.bigio@docker.com>
 2018-03-14 09:25:15 -07:00
Sebastiaan van Stijn 093b46e361 Bash: update trust completions 
The `docker trust` commands were moved out of experimental,
and the `docker trust view` command was changed to
`docker trust inspect --pretty`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2a6808db87)
 2018-03-14 09:15:23 +01:00
Victor Vieux 518a7181ad update doc 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 09ec6d4ad9)
 2018-03-14 09:14:58 +01:00
Nassim 'Nass' Eddequiouaq 48712f36a6 Move Docker Trust out of experimental 
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
(cherry picked from commit ac35e851e8)
 2018-03-14 09:14:31 +01:00
Nassim 'Nass' Eddequiouaq 3d69121433 Fix comment and misc code issues 
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
(cherry picked from commit 8c3d0b93d6)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-14 09:11:25 +01:00
Nassim 'Nass' Eddequiouaq 2d81349010 Refactor trust view command into a --pretty flag on trust inspect 
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
(cherry picked from commit c5554f811b)
 2018-03-14 08:59:32 +01:00
Andrew Hsu 89ec01afcb Bump version to 18.03.0-ce-rc3 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-03-08 09:53:33 -08:00
Andrew Hsu 3e53917a28 Merge pull request #443 from jose-bigio/18.03_versionBump 
[18.03]  Bump version to 18.03.0-ce-rc2
 2018-03-06 13:05:52 -08:00
Sebastiaan van Stijn dbe2a19e83 CLI bump swarmkit to 11d7b06f48bc1d73fc6d8776c3552a4b11c94301 
Contains no changes for the CLI, but keeps the version
in sync with engine

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-03-06 17:32:08 +01:00
Andrew Hsu 3ab4d93c66 Merge pull request #451 from andrewhsu/md 
[18.03] vndr swarmkit to 49a9d7f
 2018-03-06 07:39:11 -08:00
Andrew Hsu 9dbc108a14 Merge pull request #441 from thaJeztah/18.03-backport-templated-configs-secrets 
[18.03] Add --template-driver option for secrets/configs
 2018-03-05 22:25:55 -08:00
Andrew Hsu 1b39f8bd26 cli: vndr swarmkit 49a9d7f 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-03-06 01:45:21 +00:00
Andrew Hsu 7000ca4203 Merge pull request #447 from vdemeester/tests-fixes 
[18.03] Fixes tests to have the ci green
 2018-03-05 17:19:37 -08:00
Vincent Demeester 50c9a31b4c 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>
(cherry picked from commit 31dc5c0a9a)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-02 10:21:53 +01:00
Lydell Manganti 767a8f6227 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>
(cherry picked from commit d281b72a98)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-28 18:10:39 +01:00
Daniel Nephin 7d395933ee Add more container cp tests 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 07cb69e9bc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-28 11:16:23 +01:00
jose-bigio dd1b760bad Bump version to 18.03.0-ce-rc2 
Signed-off-by: jose-bigio <jose.bigio@docker.com>
 2018-02-27 09:34:44 -08:00
Akihiro Suda de4362e128 docs: mention sctp 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit b85d87b8ab)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-26 11:40:06 +01:00
Sebastiaan van Stijn eda1e25f5c Add --template-driver option for secrets/configs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d11b5ccdfa)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-26 11:34:23 +01:00
GordonTheTurtle 5ff63c0239 Bump version to 18.03.0-ce-rc1 
Signed-off-by: GordonTheTurtle <engine-team@docker.com>
 2018-02-21 23:59:01 +00: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 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
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 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
Daniel Nephin 912355fce6 Merge pull request #891 from vdemeester/k8s-loader-make-sure-version 
Make sure we marshall version too…
Upstream-commit: 939938b976
Component: cli
 2018-02-21 11:45:14 -05:00
Vincent Demeester 3ed0ebb0b5 Make sure we marshall version too… 
… otherwise the k8s controller might fail to parse the file as it will
think it's version 1.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9f9f1c8515
Component: cli
 2018-02-21 15:36:51 +01:00
Wataru Ishida 894af8d548 Support SCTP port mapping 
Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 995006c164
Component: cli
 2018-02-21 12:19:38 +09:00