d602967356
Merge pull request #495 from thaJeztah/18.03-backport-972-fix-merge-network
...
[18.03] backport Fix error with merge composefile with networks…
2018-04-16 19:04:36 -07:00
dc75023a9a
Merge pull request #503 from jose-bigio/18.03_version_bump
...
[18.03] version bump to 18.03.1-ce-rc1
2018-04-11 23:24:42 -07:00
aff214cf5c
Merge pull request #497 from thaJeztah/18.03-backport-fix-manifest-docs-typo
...
[18.03] [docs] Fix typo in manifest command docs: updated `MANFEST` to `MANIFEST`
2018-04-11 21:32:33 -07:00
4cff440f16
Merge pull request #499 from thaJeztah/18.03-backport-bump-golang-1.9.5
...
[18.03] bump golang to 1.9.5
2018-04-11 21:28:45 -07:00
d6931c2d12
Fix error with merge composefile with networks…
...
… and other cases too. Updating mergo fixes the bugs (but introduced a
slight behaviour change that had to be fixed too)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
(cherry picked from commit 0122730fafgithub@gone.nl >
2018-04-11 14:41:04 -07:00
92f0dce1d1
Fix docker stack deploy reference flag
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
(cherry picked from commit 2ee9635b1egithub@gone.nl >
2018-04-11 14:40:52 -07:00
7bfd67bece
Fix imports in CLI compose test
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-04-11 11:39:36 -07:00
010ba8f1dd
Fix test for trust inspect --pretty
...
This fix was part of 8c3d0b93d6github@gone.nl >
2018-04-10 17:28:16 -07:00
7dd4bb6171
18.03.1-ce-rc1 version bump
...
Signed-off-by: jose-bigio <jose.bigio@docker.com >
2018-04-10 15:52:21 -07:00
566c20094c
Remove filewatcher
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit c0588a9c8fgithub@gone.nl >
2018-04-10 15:21:13 -07:00
bc28daf367
Add more content trust tests
...
Importing from moby's DockerTrustSuite tests.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
(cherry picked from commit 8b00c5cfd8github@gone.nl >
2018-04-10 15:20:40 -07:00
a20423b7f7
Add a build unit test for symlinked context
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit 00b803b2d8github@gone.nl >
2018-04-10 15:20:29 -07:00
8723ba6cc0
Remove unused powershell function
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
(cherry picked from commit 10baa756b2github@gone.nl >
2018-04-10 15:19:06 -07:00
c270672ced
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 >
(cherry picked from commit 0cf2e6353agithub@gone.nl >
2018-04-10 15:18:59 -07:00
0d45d8f964
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 >
(cherry picked from commit facb22573dgithub@gone.nl >
2018-04-10 15:18:52 -07:00
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 63ebcae382github@gone.nl >
2018-04-10 15:14:17 -07:00
ad89cb6a38
Only read trust setting from options
...
Rename IsTrusted to ContentTrustEnabled
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit feae0e9756github@gone.nl >
2018-04-10 15:12:02 -07:00
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 6e21829af4github@gone.nl >
2018-04-10 15:07:03 -07:00
a20c69243b
Cleanup config load error handling
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit 789acb526cgithub@gone.nl >
2018-04-10 15:01:36 -07:00
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 7c8b5708ebgithub@gone.nl >
2018-04-10 15:01:20 -07:00
2cc21bf56f
Use new APIClient interface
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit cff874122cgithub@gone.nl >
2018-04-10 14:55:17 -07:00
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 e15b208e96github@gone.nl >
2018-04-10 14:48:48 -07:00
a723f7351d
manual clean of asserts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit f21276575fgithub@gone.nl >
2018-04-10 14:48:41 -07:00
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 078cbc9c4bgithub@gone.nl >
2018-04-10 14:48:34 -07:00
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 baf65a5502github@gone.nl >
2018-04-10 14:48:09 -07:00
9550f71467
dont prompt for github creds in unit test
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit 0f11a310fdgithub@gone.nl >
2018-04-10 14:45:49 -07:00
1f1816b098
Remove testutil
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit 681c921528github@gone.nl >
2018-04-10 14:40:48 -07:00
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 5155cda716github@gone.nl >
2018-04-10 14:33:18 -07:00
fb9700fdbd
Automated migration
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit 39c2ca57c1github@gone.nl >
2018-04-10 14:29:47 -07:00
70083e56be
Replace testify vendor with updated gotestyourself
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit 5ef8835f23github@gone.nl >
2018-04-10 13:54:23 -07:00
659ea5343c
Update some assertions.
...
and fix some tests
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit 93615dd967github@gone.nl >
2018-04-10 13:54:15 -07:00
49dc9b064e
Update gotestyourself dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
(cherry picked from commit 98ba439f67github@gone.nl >
2018-04-10 12:12:52 -07:00
45c8a7d911
Bump Golang to 1.9.5
...
go1.9.5 (released 2018/03/28) includes fixes to the compiler, go command, and
net/http/pprof package. See the Go 1.9.5 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.9.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit d3b8ceb52cgithub@gone.nl >
2018-04-09 16:35:48 -07:00
64fe575962
[docs] Fix typo in manifest command docs: updated MANFEST to MANIFEST.
...
Signed-off-by: Bogdan Anton <contact@bogdananton.ro >
(cherry picked from commit 9fa6bd4174github@gone.nl >
2018-04-09 13:31:04 -07:00
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
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
7d9137fefc
Merge pull request #461 from vdemeester/trust-updates
...
[18.03] move trust out of experimental
2018-03-14 10:23:54 -07:00
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
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
518a7181ad
update doc
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit 09ec6d4ad9
2018-03-14 09:14:58 +01:00
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
3d69121433
Fix comment and misc code issues
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
(cherry picked from commit 8c3d0b93d6vincent@sbr.pm >
2018-03-14 09:11:25 +01:00
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
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
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
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
3ab4d93c66
Merge pull request #451 from andrewhsu/md
...
[18.03] vndr swarmkit to 49a9d7f
2018-03-06 07:39:11 -08:00
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
1b39f8bd26
cli: vndr swarmkit 49a9d7f
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2018-03-06 01:45:21 +00:00
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
