c0588a9c8f
Remove filewatcher
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-20 20:13:27 -04:00
c0ffb9491c
Merge pull request #924 from vdemeester/trust-suite-tests
...
Add some content trust tests
2018-03-19 11:24:00 +01:00
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
a5bd2973b1
Merge pull request #945 from vdemeester/trust-follow-up
...
Small content trust enhancement
2018-03-16 11:09:00 +01:00
37eebe5cb6
Merge pull request #946 from thaJeztah/bump-moby
...
Bump moby to ae7016427f8cba4e4d8fcb979d6ba313ee2c0702
2018-03-15 09:49:25 -04:00
b17215c456
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>
2018-03-15 01:51:31 +01:00
63ebcae382
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>
2018-03-14 17:55:19 +01:00
b816bde6cc
Fix docker stack services command on Port output when kubernetes service is a LoadBalancer or a NodePort
...
* added tests on Kubernetes service conversion to swarm service
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-03-14 11:33:42 +01:00
6d7c23a6b4
Merge pull request #944 from thaJeztah/update-completion-scripts
...
Bash: update trust completions
2018-03-14 08:42:40 +01:00
2a6808db87
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>
2018-03-14 01:21:33 +01:00
176aa4865c
Merge pull request #935 from n4ss/trust-out-of-experimental2
...
Move Docker Trust out of experimental
2018-03-13 16:59:50 -07:00
09ec6d4ad9
update doc
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2018-03-13 16:50:56 -07:00
fcffd67028
Add e2e test for stack deploy
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-12 16:24:30 -04:00
b4c108a385
Fix named network in compose file
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-12 15:15:27 -04:00
ca88e5e9df
update vendor, add cmpopts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-12 15:15:23 -04:00
ac35e851e8
Move Docker Trust out of experimental
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
2018-03-09 13:29:14 -08:00
2731c71c99
Merge pull request #934 from n4ss/refactor-trust-inspect
...
Refactor trust view command into a --pretty flag on trust inspect
2018-03-09 13:25:01 -08:00
8c3d0b93d6
Fix comment and misc code issues
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
2018-03-09 20:46:37 +01:00
c5554f811b
Refactor trust view command into a --pretty flag on trust inspect
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
2018-03-09 19:12:11 +01:00
240c03a7f8
Merge pull request #929 from vdemeester/trust-no-global-var
...
Refactor content_trust cli/flags handling
2018-03-09 11:04:09 +01:00
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
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
82f325ed81
Merge pull request #925 from dnephin/add-build-test-symlink
...
Add a build unit test for symlinked context
2018-03-08 18:52:43 +01:00
310127a7d0
Merge pull request #905 from vdemeester/appveyor-setup
...
Add appveyor setup to build and unit test
2018-03-08 09:50:41 +01:00
00b803b2d8
Add a build unit test for symlinked context
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-07 13:04:33 -05:00
10baa756b2
Remove unused powershell function
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-03-07 18:18:14 +01:00
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
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
0e3677ead5
Merge pull request #921 from dnephin/use-canonical-imports
...
testing: Use canonical asserts
2018-03-07 12:00:34 -05:00
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
f351f00f9e
Merge pull request #914 from justincormack/notaryup
...
Update Notary vendor to 0.6.0 release
2018-03-07 10:38:53 +01:00
e4405205ad
man/docker-run.1: misc fixes
...
The list of changes here is too long to be described.
Maybe it's better to just rewrite the page from scratch, but at list this commit
makes some things better than before.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-03-06 15:05:32 -08:00
c2670c59fb
man/docker-run.1: fix --interactive
...
Do not mention the default value twice.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-03-06 14:34:31 -08:00
70dea5c144
man/docker-run.1: fix --device and --cgroup-device-rule
...
Use the proper man typesetting when describing the options
(i.e. use italics for variable parts, bold for literals).
Expand the description. Give better examples. Refer to mknod(2).
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-03-06 14:33:22 -08:00
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
f21276575f
manual clean of asserts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-06 15:49:00 -05:00
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
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
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
0c75f522b6
Merge pull request #918 from dnephin/remove-testutil
...
Remove testutil
2018-03-06 21:19:26 +01:00
681c921528
Remove testutil
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-06 14:38:35 -05:00
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
789acb526c
Cleanup config load error handling
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-06 13:44:06 -05:00
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
a0b19f0ec2
Merge pull request #879 from dnephin/update-assertions
...
Replace testify assertions with gotestyourself/assert
2018-03-06 17:19:51 +01:00
fe067a0877
Merge pull request #916 from dnephin/use-client-with-ops
...
Use new APIClient interface
2018-03-06 15:01:42 +01:00
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
39c2ca57c1
Automated migration
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-05 19:41:17 -05:00
5ef8835f23
Replace testify vendor with updated gotestyourself
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-05 19:41:14 -05:00
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
Sebastiaan van Stijn
Vincent Demeester
Vincent Demeester
Brian Goff
Sebastiaan van Stijn
Silvin Lubecki
Victor Vieux
Nassim 'Nass' Eddequiouaq
Daniel Nephin
Kir Kolyshkin