toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,277 Commits 3 Branches 295 Tags
387b9cc1967d4c9cc34289edee2f22b044572f42
Commit Graph
40277 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 387b9cc196 Merge component 'engine' from git@github.com:moby/moby master 2018-03-09 17:05:19 +00:00
GordonTheTurtle 35ab02988e Merge component 'cli' from git@github.com:docker/cli master 2018-03-09 16:41:36 +00: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
Vincent Demeester 0d25ace2cb Merge pull request #36539 from tophj-ibm/skip-oom-tests-ppc64le 
[integration] skip ppc64le oom tests temporarily
Upstream-commit: c8f9e14b500b1b2e23e79c52ded0aee05579d9bc
Component: engine
 2018-03-09 09:53:00 +01:00
Vincent Demeester e31b1923c7 Merge pull request #36506 from kolyshkin/pkg-mount-slice 
pkg/mount: use sort.Slice
Upstream-commit: a21d5bf669571ffc7ad31b8df3c0a632dc207b78
Component: engine
 2018-03-09 09:46:53 +01:00
Christopher Jones 671826c75d [integration] skip ppc64le oom tests for now 
These tests were enabled by changing a config option on the ci
machines, instead of from a patch, so let me disable them
for now on ppc64le and open up another patch to enable them, where I can find
out what the issues are with them.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 620ddc78a1437feaa42f40853ef586d268991620
Component: engine
 2018-03-08 17:51:37 -06:00
GordonTheTurtle d6bf3cca5c Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-03-08 22:22:13 +00:00
GordonTheTurtle 34b45355cc Merge component 'cli' from git@github.com:docker/cli master 2018-03-08 21:57:36 +00: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
Andrew Hsu e5ebdf8a68 Merge pull request #90 from seemethere/fix_dynamic 
Use new 'dynamic' args in install.sh
Upstream-commit: 5019e235eb123aba7469b0b91c8b6c1dba3feccf
Component: packaging
 2018-03-08 09:34:18 -08:00
GordonTheTurtle 342df2dbd8 Merge component 'engine' from git@github.com:moby/moby master 2018-03-08 17:07:06 +00:00
GordonTheTurtle d578d1c1c6 Merge component 'cli' from git@github.com:docker/cli master 2018-03-08 16:41:49 +00:00
Vincent Demeester d56f856549 Merge pull request #36518 from seemethere/fix_static_builds 
Build containerd, runc, and proxy statically
Upstream-commit: 0c01629e17752749b32422e327d47764ce23baac
Component: engine
 2018-03-08 13:59:34 +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
Akihiro Suda 7856345e7b Merge pull request #36505 from kolyshkin/pkg-mount-tests 
pkg/mount unit tests: skip some test under non-root
Upstream-commit: 4a1d35c546c4a5df3353f5984d86671f702a315a
Component: engine
 2018-03-08 17:27:31 +09:00
Eli Uriegas 445c3dadbe Use new 'dynamic' args in install.sh 
Scripts were changed around to do static by default, this changes so
that we have "dynamic" inserted where it needs to be inserted

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 130f74155e39ddc36b59d7c47867230284739710
Component: packaging
 2018-03-08 00:20:10 +00:00
Eli Uriegas 3398cf7be9 buildmod => buildmode 
There was a typo with the buildmode flag for containerd

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 5e4885b9afb1de30133627ce751af2c0e7b72a4e
Component: engine
 2018-03-07 21:36:23 +00:00
Eli Uriegas b6d64a77d2 Build containerd, runc, and proxy statically 
These were originally static binaries in the first place, this changes
them back to that.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 63c7bb24637fdbfd905096ecc75b435ecefd31e9
Component: engine
 2018-03-07 21:29:10 +00:00
Tõnis Tiigi 1158d96fc9 Merge pull request #36307 from kolyshkin/dm-misc 
devmapper cleanup improvements
Upstream-commit: bc7424b4434443b036604277bfcdee3fa34a268a
Component: engine
 2018-03-07 12:57:21 -08: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
GordonTheTurtle 7ad6c1ceaa Merge component 'engine' from git@github.com:moby/moby master 2018-03-07 17:05:36 +00: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
GordonTheTurtle 6f963bee65 Merge component 'cli' from git@github.com:docker/cli master 2018-03-07 16:41:39 +00:00
John Stephens 2c2dcf7989 Merge pull request #36451 from Microsoft/jjh/ubr 
Windows: Report Version and UBR
Upstream-commit: 8cf8fe9cf80a07d4e68829f619ea2c71fbb5af0c
Component: engine
 2018-03-07 06:27:01 -08: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
Yong Tang 9e6eb16d6f Merge pull request #36502 from thaJeztah/remove-duplicate-test 
Remove duplicate TestServiceUpdatePort
Upstream-commit: f3a3778808dae0da82f2acf300875b5da931c000
Component: engine
 2018-03-06 15:18:30 -08: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
Kir Kolyshkin c617524866 pkg/mount: use sort.Slice 
Sorting by mount point length can be implemented in a more
straightforward fashion since Go 1.8 introduced sort.Slice()
with an ability to provide a less() function in place.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: a00310b54c0cdcafb402aeea92feca865da9fdf3
Component: engine
 2018-03-06 12:46:58 -08: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
Kir Kolyshkin db90a864e8 pkg/mount unit tests: skip some test under non-root 
This makes `go test .` to pass if run as non-root user, skipping
those tests that require superuser privileges (for `mount`).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 4aae77602a7540b4f977572f3fbdc0891ac57cab
Component: engine
 2018-03-06 12:37:27 -08: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
Yong Tang 18ad0fab61 Merge pull request #36494 from stevvooe/remove-unnecessary-types-file 
daemon/stats: remove obnoxious types file
Upstream-commit: 4db41f1a69fc38337baaee9edb763a3672fa047c
Component: engine
 2018-03-06 11:52:56 -08: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
GordonTheTurtle 7d173fd392 Merge component 'engine' from git@github.com:moby/moby master 2018-03-06 17:08:52 +00:00
GordonTheTurtle 3258000bfc Merge component 'cli' from git@github.com:docker/cli master 2018-03-06 16:41:54 +00: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 f51e800a06 Remove duplicate TestServiceUpdatePort 
The TestAPIServiceUpdatePort test performs exactly
the same steps.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 36e1646e4f010ea033643c6df3d9c3dccc166ed2
Component: engine
 2018-03-06 16:17:13 +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