2b42807dc0
Merge component 'engine' from git@github.com:moby/moby master
2018-03-02 16:41:20 +00:00
8d8ee52c02
Merge pull request #36460 from yongtang/03012018-import
...
Add missing canonical import comment to files in integration tests
Upstream-commit: 135f815fb4b1c362c0b212e9f3dd3b0cea81616b
Component: engine
2018-03-02 09:37:58 +01:00
59d8a525c8
Add missing canonical import comment to files in integration tests
...
The canonical import comment was added some time ago, though several
newly added files do not have the comment. This fix adds the missing
canonical import comment to files in integration tests
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9045406144413920da49629a181bb787c670197e
Component: engine
2018-03-01 22:51:11 +00:00
c17eb54e99
Merge pull request #36455 from thaJeztah/flip-asserts
...
Fix "expected" and "actual" being reversed
Upstream-commit: 7459e4cd4fc71dec134e0a90bb317142dcd4270d
Component: engine
2018-03-01 21:31:46 +01:00
f7a26ee523
Merge pull request #36445 from yongtang/02282018-secret-inspect
...
Remove docker_cli_secret_inspect_test.go
Upstream-commit: 9276750543074a36422b391008e00a7e45a9c991
Component: engine
2018-03-01 09:40:45 -08:00
969c8724a0
Merge component 'engine' from git@github.com:moby/moby master
2018-03-01 16:40:13 +00:00
32f6a89499
Merge pull request #36450 from yongtang/02282018-enhancement
...
Enhancement of replacing ContainerCreate with helper funcs in tests
Upstream-commit: fa018b433a4baa552ffbeb5d53d5674c6467b8e5
Component: engine
2018-03-01 16:47:49 +01:00
82ee559ff8
Fix "expected" and "actual" being reversed
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a2517cbf62d75c48861337182aa841c5089f8ac4
Component: engine
2018-03-01 14:16:19 +01:00
da1e08d484
Merge component 'engine' from git@github.com:moby/moby master
2018-03-01 01:35:10 +00:00
bc59bfb890
Merge component 'cli' from git@github.com:docker/cli master
2018-03-01 01:11:14 +00:00
9361078009
Merge pull request #448 from seemethere/cherry_pick_cli_version
...
[master] Bump CLI VERSION to 18.04.0-dev
2018-02-28 17:08:42 -08:00
17a2a3b279
Bump VERSION to 18.04.0-dev
...
The Docker 18.03 branch was cut from
CLI: 84c7dd6057github@gone.nl >
(cherry picked from commit 06dd62ab1eeli.uriegas@docker.com >
2018-02-28 22:30:57 +00:00
dd065f4320
Merge pull request #36425 from vdemeester/dockerfile-adjusts
...
Follow-up fixes on multi-stage moby's Dockerfile
Upstream-commit: 78efc2f38362b60d4e66a142c0c3cbadc7e89ae3
Component: engine
2018-02-28 23:07:27 +01:00
fb7feb1626
Enhancement of replacing ContainerCreate with helper funcs in tests
...
This fix is a minor enhancement to replace several ContainerCreate with
helper funcs of `container.Create` in tests.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 6ad4720c78d6ac61a60a3e7ed1d0c0119c5d103e
Component: engine
2018-02-28 21:35:56 +00:00
3521e40e1a
Remove docker_cli_secret_inspect_test.go
...
as the test (TestSecretInspectMultiple) seems to have been covered pretty well in cli:
https://github.com/docker/cli/blob/master/cli/command/secret/inspect_test.go
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 3d38adb20c619b87edab72e51ff0fd1cf6e08691
Component: engine
2018-02-28 17:16:47 +00:00
060165553c
Merge pull request #911 from vdemeester/update-gotestyourself
...
Update gotestyourself dependency
Upstream-commit: c26f37c0cc
2018-02-28 18:07:37 +01:00
c2ab7d89c3
Merge pull request #912 from kkirsche/patch-1
...
Fix grammar typo in comment
Upstream-commit: 60dcc4cdfb
2018-02-28 11:58:01 -05:00
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
2018-02-28 11:29:40 -05:00
919ca49c30
Update gotestyourself dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 98ba439f67
2018-02-28 16:11:02 +01:00
7c89f9b56b
Merge pull request #909 from LydellManganti/LydellManganti-patch-1
...
Update run.md --restart to include unless-stopped
Upstream-commit: c19b272c09
2018-02-28 14:53:49 +01:00
5ea7143788
Merge pull request #36434 from dnephin/fix-cp-cli-tests
...
Migrate some container copy tests to integration
Upstream-commit: 75377ec12c44fed7d5dcb131438ae88d9fe7df84
Component: engine
2018-02-28 12:28:18 +01:00
04c0eb713d
Merge pull request #36429 from mnussbaum/cleanup_container_unit_test_temp_dir
...
Clean up a temp dir created in container unit test
Upstream-commit: 7c7dfce37f629d44eb6f86bd960643fc5b2c8252
Component: engine
2018-02-28 12:28:01 +01:00
63f4daf361
Update run.md --restart to include unless-stopped
...
Update --restart option to include unless-stopped to be consistent with https://docs.docker.com/config/containers/start-containers-automatically/#use-a-restart-policy
Signed-off-by: Lydell Manganti <lydell.manganti@gmail.com >
Upstream-commit: d281b72a98
2018-02-28 21:05:30 +10:00
c453879121
Merge pull request #36430 from yongtang/02262018-config-test
...
Migrate config inspect test to api test
Upstream-commit: 973cf656ddb75656fd3225854be13a911377eda6
Component: engine
2018-02-28 11:50:52 +01:00
1d9d1d8c5e
Merge pull request #907 from dnephin/add-more-container-copy-tests
...
Add more container cp tests
Upstream-commit: c9303404d4
2018-02-28 11:12:56 +01:00
2c1f22484b
Merge pull request #36375 from arm64b/frozen-busybox-latest-glibc
...
Frozen busybox latest glibc
Upstream-commit: 3e0299f58c580dd356163cce0d9ca2e686ff1d15
Component: engine
2018-02-28 10:55:08 +01:00
64a7496544
Merge pull request #36293 from yongtang/02122018-rm-tests
...
Migrate several docker rm tests to api tests
Upstream-commit: 8fe1589615318c4761b314a18fdb0de2fb5e0d56
Component: engine
2018-02-28 09:25:49 +01:00
6150221be3
Use golang official image instead debian stretch
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 572cb664621ca08e912a006c5c9cf2fb568ce757
Component: engine
2018-02-28 09:04:48 +01:00
35e67f98e4
Merge pull request #36427 from vdemeester/micro-clean-docker-cli-build-test
...
Clean some docker_cli_build_tests that are cli-only
Upstream-commit: f571eb1720de2bca5875b6a107f543249858b688
Component: engine
2018-02-28 08:20:51 +01:00
3711359ab5
Clean-up after container unit test
...
Remove temp directories and close file loggers in container unit tests.
Signed-off-by: mnussbaum <michael.nussbaum@getbraintree.com >
Upstream-commit: 07d5446fe27cb92d881df48be6e8a6510d9608b0
Component: engine
2018-02-28 01:15:15 +00:00
f4c3a36fa1
Merge pull request #36267 from Microsoft/jjh/removeservicing
...
Windows: Remove servicing mode
Upstream-commit: 1346a2c89a11f2d111ff20f46d557f1f9ccbbeb7
Component: engine
2018-02-28 01:15:03 +01:00
6f429fb8a3
Migrate config inspect test to api test
...
This fix migrates config inspect test in integration-cli
to api test.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 4b99d782079dc390c2d8fb78f6973bbeee7d8a47
Component: engine
2018-02-27 23:25:07 +00:00
599e1c79a6
Merge pull request #36240 from dnephin/investigate-image-component
...
Extract ImageService from Daemon
Upstream-commit: 6cb75dd5b61f438b026572aca0c191c7d2fb7694
Component: engine
2018-02-27 14:35:01 -08:00
3b71e84103
Migrate some copy tests to integration
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 00d409f03ed825f623b6ef8ec5a3a91cd26194c2
Component: engine
2018-02-27 16:48:35 -05:00
697a64b33e
Add more container cp tests
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 07cb69e9bc
2018-02-27 16:38:02 -05:00
bedfb491b4
Migrate several docker rm tests to api tests
...
This fix migrates several docker rm tests to api tests
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 6bd4f4801b244555213f0040b9885033e99d4ae8
Component: engine
2018-02-27 19:20:01 +00:00
be84720c48
Merge pull request #139 from shhsu/v3_credhelper
...
Silent login: use credentials from cred store to login
Upstream-commit: 2cc6ff131d
2018-02-27 19:08:53 +01:00
afdaedaad3
Merge pull request #904 from vdemeester/fix-run-label-flag-behavior
...
Fix `--label` behavior on run
Upstream-commit: a9c6c52dc0
2018-02-27 19:07:24 +01:00
a0d675b388
Windows: Remove servicing mode
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d4f37c08858b90e8603741ba92de8e0d39b88eb3
Component: engine
2018-02-27 08:48:31 -08:00
bed6817329
Merge pull request #36272 from mnussbaum/36255-fix_log_path
...
Fix empty LogPath with non-blocking logging mode
Upstream-commit: a1afe38e5225b12d91e66ca4d89ac378c2df0a29
Component: engine
2018-02-27 11:25:39 -05:00
37ba7892be
Merge pull request #898 from silvin-lubecki/add-stack-to-version-command
...
Print Stack API and Kubernetes versions in version command
Upstream-commit: 2851c007fe
2018-02-27 17:14:55 +01:00
c2447aef7c
Merge pull request #36391 from vdemeester/update-e2e-script
...
Update e2e run script
Upstream-commit: 3cb8635001ee4723e08e6e4175e50494c72bf120
Component: engine
2018-02-27 16:23:36 +01:00
1988af7bf7
Clean some docker_cli_build_tests that are cli-only
...
Remove TestBuildRenamedDockerfile and TestBuildDockerfileOutsideContext
that are cli-only tests (and already tested in the docker/cli
repository).
Also adds some comments on few tests that could be migrate to
docker/cli.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 894c213b3bd6f4d8f344837b5b5084360a013680
Component: engine
2018-02-27 13:42:29 +01:00
2e25fe581a
Merge pull request #36292 from yongtang/0212-2018-volumes-tests
...
Migrate volumes tests in integration-cli to api tests
Upstream-commit: 407e122ac3dc29a739fa99e0684b45f7e52fa71e
Component: engine
2018-02-27 13:06:06 +01:00
70e2992847
Fix --label behavior on run
...
Commit 2b17f4c8a8vincent@sbr.pm >
Upstream-commit: 31dc5c0a9a
2018-02-27 12:14:07 +01:00
b1748ad25c
Merge pull request #893 from adshmh/add-support-for-mandatory-variables-syntax-to-stack-deploy
...
add support for mandatory variables to stack deploy
Upstream-commit: 750b038707
2018-02-27 10:25:22 +01:00
5889969510
Merge pull request #36424 from liubin/fix-typo
...
Fix typos in builder and client
Upstream-commit: 5b124d7422c723ae8e403d24afc9e78dc06bbefe
Component: engine
2018-02-27 10:24:20 +01:00
f7442fe6a7
Merge pull request #36406 from yongtang/02222018-secret-create-with-labels
...
Migrate some config secret tests to api test
Upstream-commit: 2c24bfd07069f8d3c292ff2ce5ac32e3d762a5b3
Component: engine
2018-02-27 10:01:39 +01:00
1269ee770f
Do not copy golang in itself
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 30498c7c5f2e63a48fa285d117b4388d2a4961e6
Component: engine
2018-02-27 09:16:13 +01:00
37a473147f
Network testing with busybox:glibc
...
Using the `busybox:glibc` instead of `busybox:latest` to the
network related test cases (`ping` issue).
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 0d31dee5ec724731607e277a415b1ca4ecb7b2c4
Component: engine
2018-02-27 06:53:00 +00:00
