toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,131 Commits 3 Branches 295 Tags
48f3c4dac0d7accf3e34a6f819dc65cb45eeed2b
Commit Graph
5131 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester 48f3c4dac0 Merge pull request #955 from dnephin/remove-filewatcher 
Remove filewatcher
Upstream-commit: c1b58a9096
Component: cli
 2018-03-21 14:31:26 +01:00
Daniel Nephin 3d78b27c6b Remove filewatcher 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0588a9c8f
Component: cli
 2018-03-20 20:13:27 -04:00
Sebastiaan van Stijn da9476e6ad Merge pull request #924 from vdemeester/trust-suite-tests 
Add some content trust tests
Upstream-commit: c0ffb9491c
Component: cli
 2018-03-19 11:24:00 +01:00
Vincent Demeester 0aa2494ead Add more content trust tests 
Importing from moby's DockerTrustSuite tests.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8b00c5cfd8
Component: cli
 2018-03-19 10:02:40 +01:00
Vincent Demeester 7d839876b1 Merge pull request #945 from vdemeester/trust-follow-up 
Small content trust enhancement
Upstream-commit: a5bd2973b1
Component: cli
 2018-03-16 11:09:00 +01:00
Brian Goff ce28c959c9 Merge pull request #946 from thaJeztah/bump-moby 
Bump moby to ae7016427f8cba4e4d8fcb979d6ba313ee2c0702
Upstream-commit: 37eebe5cb6
Component: cli
 2018-03-15 09:49:25 -04:00
Sebastiaan van Stijn 30deffedde Bump moby to ae7016427f8cba4e4d8fcb979d6ba313ee2c0702 
Bring in:

- moby 36517 ensure hijackedConn implements CloseWrite function
- moby 36489 (fixes `errdefs.ErrSystem` interface)
- moby 36506 pkg/mount: use sort.Slice
- moby 36451 Windows: Report Version and UBR

Also update moby dependencies to keep them in sync

- golang.org/x/sync (no code changes)
- Bump runc to 4fc53a81fb7c994640722ac585fa9ca548971871
- Bump swarmkit to 49a9d7f6ba3c1925262641e694c18eb43575f74b

no local code changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b17215c456
Component: cli
 2018-03-15 01:51:31 +01:00
Vincent Demeester fb08bdcb4b 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>
Upstream-commit: 63ebcae382
Component: cli
 2018-03-14 17:55:19 +01:00
Vincent Demeester 9c4b5f4db9 Merge pull request #944 from thaJeztah/update-completion-scripts 
Bash: update trust completions
Upstream-commit: 6d7c23a6b4
Component: cli
 2018-03-14 08:42:40 +01:00
Sebastiaan van Stijn 065614040d 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>
Upstream-commit: 2a6808db87
Component: cli
 2018-03-14 01:21:33 +01:00
Victor Vieux 0607bea593 Merge pull request #935 from n4ss/trust-out-of-experimental2 
Move Docker Trust out of experimental
Upstream-commit: 176aa4865c
Component: cli
 2018-03-13 16:59:50 -07:00
Victor Vieux b97b29bfcb update doc 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 09ec6d4ad9
Component: cli
 2018-03-13 16:50:56 -07:00
Nassim 'Nass' Eddequiouaq 3d40163b5c Move Docker Trust out of experimental 
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
Upstream-commit: ac35e851e8
Component: cli
 2018-03-09 13:29:14 -08:00
Victor Vieux 84628fc361 Merge pull request #934 from n4ss/refactor-trust-inspect 
Refactor trust view command into a --pretty flag on trust inspect
Upstream-commit: 2731c71c99
Component: cli
 2018-03-09 13:25:01 -08:00
Nassim 'Nass' Eddequiouaq 56c837b651 Fix comment and misc code issues 
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
Upstream-commit: 8c3d0b93d6
Component: cli
 2018-03-09 20:46:37 +01:00
Nassim 'Nass' Eddequiouaq bb8f7ed84c Refactor trust view command into a --pretty flag on trust inspect 
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
Upstream-commit: c5554f811b
Component: cli
 2018-03-09 19:12:11 +01:00
Sebastiaan van Stijn cb331ab272 Merge pull request #929 from vdemeester/trust-no-global-var 
Refactor content_trust cli/flags handling
Upstream-commit: 240c03a7f8
Component: cli
 2018-03-09 11:04:09 +01:00
Daniel Nephin a895fe3327 Only read trust setting from options 
Rename IsTrusted to ContentTrustEnabled

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

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6e21829af4
Component: cli
 2018-03-08 15:00:43 -05:00
Sebastiaan van Stijn 925dbcac37 Merge pull request #925 from dnephin/add-build-test-symlink 
Add a build unit test for symlinked context
Upstream-commit: 82f325ed81
Component: cli
 2018-03-08 18:52:43 +01:00
Sebastiaan van Stijn 62cc4eebd1 Merge pull request #905 from vdemeester/appveyor-setup 
Add appveyor setup to build and unit test
Upstream-commit: 310127a7d0
Component: cli
 2018-03-08 09:50:41 +01:00
Daniel Nephin 5b9b83cf96 Add a build unit test for symlinked context 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 00b803b2d8
Component: cli
 2018-03-07 13:04:33 -05:00
Vincent Demeester 3d323d03af Remove unused powershell function 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 10baa756b2
Component: cli
 2018-03-07 18:18:14 +01:00
Vincent Demeester 39e1627a66 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>
Upstream-commit: 0cf2e6353a
Component: cli
 2018-03-07 18:18:13 +01:00
Vincent Demeester 22b79a8c67 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>
Upstream-commit: facb22573d
Component: cli
 2018-03-07 18:14:10 +01:00
Daniel Nephin bd1a3c6e68 Merge pull request #921 from dnephin/use-canonical-imports 
testing: Use canonical asserts
Upstream-commit: 0e3677ead5
Component: cli
 2018-03-07 12:00:34 -05:00
Sebastiaan van Stijn 17282c064a Merge pull request #920 from dnephin/fix-image-build-github 
Don't prompt for github creds in unit test
Upstream-commit: 485a01fb53
Component: cli
 2018-03-07 14:22:52 +01:00
Sebastiaan van Stijn ac93c97ba9 Merge pull request #914 from justincormack/notaryup 
Update Notary vendor to 0.6.0 release
Upstream-commit: f351f00f9e
Component: cli
 2018-03-07 10:38:53 +01:00
Daniel Nephin ef941c7ad3 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>
Upstream-commit: e15b208e96
Component: cli
 2018-03-06 16:00:28 -05:00
Daniel Nephin 0d96772294 manual clean of asserts 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f21276575f
Component: cli
 2018-03-06 15:49:00 -05:00
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
Justin Cormack 17f0eebf06 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>
Upstream-commit: 9da428da2e
Component: cli
 2018-03-02 14:56:12 +00: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