toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,236 Commits 3 Branches 295 Tags
6f963bee65717434ea2032a04fdfceaf4a41baa7
Commit Graph
40236 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 6f963bee65 Merge component 'cli' from git@github.com:docker/cli master 2018-03-07 16:41:39 +00: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 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
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 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
Sebastiaan van Stijn 0aaffbe844 Merge pull request #36417 from NobodyOnSE/patch-2 
Whitelist statx syscall
Upstream-commit: f0694e968fe600efdf24ab0d3a1b0e887267aea2
Component: engine
 2018-03-06 14:33:56 +01:00
Sebastiaan van Stijn 062463b48b Merge pull request #36316 from selansen/36247 
Fix to address regression caused by PR 30897
Upstream-commit: 0b0af855ae28698f8e3dc97cdc2a46e714ce6b6a
Component: engine
 2018-03-06 13:40:29 +01:00
Sebastiaan van Stijn 46b936e807 Merge pull request #36493 from cpuguy83/add_plugin_timeout_test 
Adds a unit test for plugin request timeout
Upstream-commit: 390b74cb6376e70f9376b96a8a82557124e67a9b
Component: engine
 2018-03-06 12:45:17 +01:00
NobodyOnSE c527ffbfcc Whitelist statx syscall for libseccomp-2.3.3 onward 
Older seccomp versions will ignore this.

Signed-off-by: NobodyOnSE <ich@sektor.selfip.com>
Upstream-commit: b2a907c8cab64830c9e424eb1ec71e0429d326ff
Component: engine
 2018-03-06 08:42:12 +01:00
Vincent Demeester cb84ae24c4 Merge pull request #36444 from yongtang/02142018-events-tests 
Migrate events tests to api tests
Upstream-commit: 2f7a76a6a0959109e4438952c88c824078cea074
Component: engine
 2018-03-06 08:36:30 +01:00
Yong Tang 847ef0d3fb Merge pull request #36490 from yongtang/03052018-expected-actual 
Address `expected` vs `actual` in integration tests
Upstream-commit: e02fa4a679c670d0745a1f828274297feb5a193c
Component: engine
 2018-03-05 19:40:53 -08:00
Brian Goff ca48b9593b Merge pull request #36437 from kolyshkin/dm-unused 
devmapper.Mounted: remove
Upstream-commit: a6b1d2ea297827d763de9e4b1940434e00a37883
Component: engine
 2018-03-05 18:14:36 -08:00
Yong Tang 0faba84bd7 Merge pull request #36474 from yongtang/03022018-rm-test 
Migrate docker rm tests to api tests
Upstream-commit: da559d01d140978123c37f0f359c4aa5b022adb4
Component: engine
 2018-03-05 17:15:26 -08: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
selansen 483e590861 Fix to address regression caused by PR 30897 
With the inclusion of PR 30897, creating service for host network
    fails in 18.02. Modified IsPreDefinedNetwork check and return
    NetworkNameError instead of errdefs.Forbidden to address this issue

Signed-off-by: selansen <elango.siva@docker.com>
Upstream-commit: 7cf8b20762cc9491f52ff3f3d94c880378183696
Component: engine
 2018-03-05 19:10:39 -05:00
John Stephens 666369f138 Merge pull request #36327 from Microsoft/jjh/block-pulling-uplevel 
Windows: Block pulling uplevel images
Upstream-commit: 3e1505e3e671d35636f7818dc1f41e4a4d429620
Component: engine
 2018-03-05 15:12:52 -08: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
Yong Tang 391894bb6c Address expected vs actual in integration tests 
This fix addresses `expected` vs `actual` in integration tests
so that they match `assert.Equal(t, expected, actual)`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8a854e933b3dbb26cfce28b920cff61909412c6f
Component: engine
 2018-03-05 20:39:42 +00:00
Brian Goff 61babf754e Adds a unit test for plugin request timeout 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7ca971fb495e4de4aa4455964625974464d86920
Component: engine
 2018-03-05 15:38:56 -05:00
Yong Tang 02ba73152d Migrate docker rm tests to api tests 
This fix migrates docker rm test in integration-cli
to api tests.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ed58ba99fb28ceac56063b7f003f38b597ddef80
Component: engine
 2018-03-05 20:35:14 +00:00
Yong Tang fd6608a9da Merge pull request #36468 from vdemeester/e2e-container-run 
Fixes some integration/container tests to run on remote daemon
Upstream-commit: 4b2fb7e394e8ee631394d6c12f8267065f39766b
Component: engine
 2018-03-05 12:23:24 -08:00
GordonTheTurtle e5ed7f4225 Merge component 'engine' from git@github.com:moby/moby master 2018-03-05 17:39:27 +00:00
Akihiro Suda dec1b3c995 Merge pull request #36407 from agawish/36395-mount-print 
36395 mount print
Upstream-commit: 8830ef804fec52f3087d9c24a8583ca9954e0967
Component: engine
 2018-03-06 02:31:21 +09:00
Vincent Demeester b917c45482 Merge pull request #36471 from yongtang/03022018-improvement 
Improvement in integration tests
Upstream-commit: 3af9b1d395615882dc64df68878139fd5e68712c
Component: engine
 2018-03-05 17:54:09 +01:00
GordonTheTurtle 12ab7bd4cb Merge component 'engine' from git@github.com:moby/moby master 2018-03-05 16:41:15 +00:00
Yong Tang bcdb133cb4 Migrate events tests to api tests 
This fix migrates events tests in integration-cli to api tests.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 3a749157d2c2b320fea49f7aa4d4eb634f52662f
Component: engine
 2018-03-05 16:13:48 +00:00
Vincent Demeester 85d9dcf398 Fixes some integration/container test to run on remote daemon 
```
docker build -f Dockerfile.e2e -t moby-e2e .
docker run -v /var/run/docker.sock:/var/run/docker.sock \
           -e TEST_INTEGRATION_DIR=/tests/integration/container \
           -e DOCKER_API_VERSION=1.36 moby-e2e
```

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 18dd1d9aba3c79d355abaa7f498b88ad816f7d04
Component: engine
 2018-03-05 14:24:01 +01:00
Vincent Demeester bc39105891 Merge pull request #36449 from thaJeztah/bump-runc-1.0-rc5 
Bump Runc to 1.0.0-rc5
Upstream-commit: 61cb026e7eba8ecd720b752244e14ce142b0c288
Component: engine
 2018-03-05 11:44:21 +01:00
Sebastiaan van Stijn b0676c2968 Merge pull request #36476 from yongtang/03022018-kill_test 
Remove unnecessary container.WithName in kill test
Upstream-commit: e3814ece2147b4a6c7f01e6611aa7c886ce26fed
Component: engine
 2018-03-05 11:42:30 +01:00
GordonTheTurtle 0265691c4b Merge component 'engine' from git@github.com:moby/moby master 2018-03-04 16:41:54 +00:00
Yong Tang e10e8cecdc Merge pull request #36475 from IRCody/logdriver-errors 
daemon/logger/ring.go: log error not instance
Upstream-commit: 954e55b3745fe764df54e8fc19039b49bcd2f1a3
Component: engine
 2018-03-03 15:51:35 -08:00
GordonTheTurtle 0fb17d706d Merge component 'engine' from git@github.com:moby/moby master 2018-03-03 16:40:29 +00:00
Cody Roseborough 530cbde3fb daemon/logger/ring.go: log error not instance 
Log the error returned from logdriver.Log() instead of the logdriver
itself.

Signed-off-by: Cody Roseborough <crrosebo@amazon.com>
Upstream-commit: a1956b5623fad186ad39ae8aca998284003b0cd3
Component: engine
 2018-03-03 16:29:57 +00:00
Sebastiaan van Stijn c04142001c Merge pull request #36438 from kolyshkin/dm-rm 
devmapper/Remove(): use Rmdir, ignore errors
Upstream-commit: 6fe8384939b867409a5021d97afe5d2a606d0f0c
Component: engine
 2018-03-03 15:10:08 +01:00
Akihiro Suda ff4f20efc2 Merge pull request #36459 from yongtang/02282018-export-test 
Migrate export tests to api tests
Upstream-commit: e734e8f51597bba3d7c097144d981b85b30dde99
Component: engine
 2018-03-03 12:29:53 +09:00
Kir Kolyshkin ce4da0689b devmapper/Remove(): use Rmdir, ignore errors 
1. Replace EnsureRemoveAll() with Rmdir(), as here we are removing
   the container's mount point, which is already properly unmounted
   and is therefore an empty directory.

2. Ignore the Rmdir() error (but log it unless it's ENOENT). This
   is a mount point, currently unmounted (i.e. an empty directory),
   and an older kernel can return EBUSY if e.g. the mount was
   leaked to other mount namespaces.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 732dd9b848bec70a2ecb5b4998918886a0cec497
Component: engine
 2018-03-02 18:10:57 -08:00
Yong Tang 9781623852 Remove unnecessary container.WithName in kill test 
This fix removes several unnecessary `container.WithName`
usage in docker kill integration test.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1778719d6ac166250acfaebe5dd99b5e9d151c3e
Component: engine
 2018-03-03 01:06:49 +00:00
Yong Tang 49ec29b887 Improvement in integration tests 
This fix adds several improvement:
1. No need for explicit ContainerRemove as it has been handled in setupTest()
2. Added `container.WithImage` helper function and used it in commit tests.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6ab465804b0b8cec6c5ac278a21151d49e34885d
Component: engine
 2018-03-02 19:03:59 +00:00
GordonTheTurtle 2b42807dc0 Merge component 'engine' from git@github.com:moby/moby master 2018-03-02 16:41:20 +00:00