77d0975ce7
Merge component 'engine' from git@github.com:docker/engine master
2018-08-05 17:02:36 +00:00
c811febb3c
Merge pull request #37586 from thaJeztah/bump_swarmkit
...
Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
Upstream-commit: f57f260b49b6142366e6bc1274204ee0a1205945
Component: engine
2018-08-05 09:11:58 -07:00
7e95203d7f
Merge component 'engine' from git@github.com:docker/engine master
2018-08-04 01:01:42 +00:00
4706b6f33a
Merge component 'cli' from git@github.com:docker/cli master
2018-08-04 00:36:35 +00:00
c213d85ec3
Merge pull request #1271 from albers/completion-shellcheck
...
Fix shellcheck warnings
Upstream-commit: b5768bea9b
Component: cli
2018-08-04 01:36:36 +02:00
6d14e4f6a2
Merge pull request #1269 from albers/completion-cp--archive
...
Add bash completion for `cp --archive`
Upstream-commit: e8cd06c8eb
Component: cli
2018-08-03 23:48:52 +02:00
22b9c5ed2c
Merge pull request #1270 from Ace-Tang/master
...
bash completion: fix uncorrect completion
Upstream-commit: ad28cec012
Component: cli
2018-08-03 23:26:09 +02:00
baf9cf6d1a
Merge pull request #37583 from Microsoft/jjh.37562
...
Don't invoke HCS shutdown if terminate called; removes unused vars and no-op calls
Upstream-commit: eeea12db7a65e6ad633747e49928c80b0f18d86b
Component: engine
2018-08-03 22:05:06 +02:00
a972373b51
Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
...
Relevant changes;
- swarmkit #2593 agent: return error when failing to apply network key
- swarmkit #2645 Replace deprecated grpc functions
- swarmkit #2720 Test if error is nil before to log it
- swarmkit #2712 [orchestrator] Fix task sorting
- swarmkit #2677 [manager/orchestrator/reaper] Fix the condition used for skipping over running tasks
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 660fa129c0ea09c1aa1770b5f2d26ec762213484
Component: engine
2018-08-03 18:55:53 +02:00
73443cfafe
Fix shellcheck warnings
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e587ec293b
Component: cli
2018-08-03 15:28:09 +02:00
1dfbd7519a
bash completion: fix uncorrect completion
...
fix uncorrect completion for command
docker docker <tab>
Signed-off-by: Ace-Tang <aceapril@126.com >
Upstream-commit: 7b4e2f3145
Component: cli
2018-08-03 21:27:27 +08:00
13b26eee62
Add bash completion for cp --archive
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b9b3754ad3
Component: cli
2018-08-03 14:30:30 +02:00
295ddc5339
Don't invoke HCS shutdown if terminate called
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5cfededc7ca552260f8eb7319184437a816e480d
Component: engine
2018-08-02 16:29:37 -07:00
851e1e2005
Merge component 'cli' from git@github.com:docker/cli master
2018-08-02 20:36:49 +00:00
f92453678a
Merge pull request #1259 from adshmh/add-unit-test-to-cover-network-list-sort
...
Add unit test to cover network list sort, refactor to table-driven tests
Upstream-commit: e902ae9f84
Component: cli
2018-08-02 20:28:53 +02:00
115f23480e
refactor network list unit tests to table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 021bf39d76
Component: cli
2018-08-02 14:07:06 -04:00
d4fe2b6044
add unit test to cover the sort order of network list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 4f388ffca3
Component: cli
2018-08-02 14:07:06 -04:00
cd93f23d9c
Merge component 'engine' from git@github.com:docker/engine master
2018-08-02 17:02:15 +00:00
1ae49cf365
Merge component 'cli' from git@github.com:docker/cli master
2018-08-02 16:36:50 +00:00
a727cc8ee8
Merge pull request #1262 from vdemeester/allow-custom-pattern
...
Allow custom pattern when extracting variable…
Upstream-commit: ff1a34d9a9
Component: cli
2018-08-02 18:00:38 +02:00
c1168064aa
Merge pull request #1254 from albers/completion-kubernetes
...
Add bash completion for kubernetes orchestrator
Upstream-commit: 731b4f1fb4
Component: cli
2018-08-02 17:30:31 +02:00
4cbdb398d7
Allow custom pattern when extracting variable…
...
… as it is possible to do it when interpolating. It also fixes when
there is 2 variables on the same *value* (in the composefile, on the
same line)
Finaly, renaming the default, used in cli, pattern to `defaultPattern`
to not be shadowed unintentionally.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4c87725c35
Component: cli
2018-08-02 16:50:40 +02:00
e08a81b044
Merge pull request #37541 from yongtang/07282018-ipc-container
...
Migrate some ipc container test from integration-cli to integration
Upstream-commit: 75fe41444009947d319f76e68b5e1f2124c79b4d
Component: engine
2018-08-02 15:51:25 +02:00
f2b2ca3774
Merge component 'cli' from git@github.com:docker/cli master
2018-08-02 12:36:56 +00:00
841a592280
Add bash completion for kubernetes orchestrator
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 08f8ee1320
Component: cli
2018-08-02 13:54:31 +02:00
907c1bdfa8
Only complete swarm specific options with orchestrator=swarm
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8ef01e869e
Component: cli
2018-08-02 13:54:31 +02:00
19734fb410
Add support for orchestrator specific bash completions
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ff953751d3
Component: cli
2018-08-02 13:54:31 +02:00
5f6d6806ac
Merge pull request #1251 from silvin-lubecki/fix-stack-help-command
...
Fix help message flags on docker stack commands and sub-commands
Upstream-commit: 4fbb009d39
Component: cli
2018-08-02 13:10:36 +02:00
66b7137cbd
Merge component 'engine' from git@github.com:docker/engine master
2018-08-02 01:02:21 +00:00
a055aa9d40
Migrate some ipc container test from integration-cli to integration
...
This fix migrates some ipc container tests from integration-cli
to integration test.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 80c92c9b692b79273200b6e37f14a6d4e984ab8d
Component: engine
2018-08-01 21:51:45 +00:00
f4ebc73a60
Merge pull request #37465 from Russtopia/master
...
namesgenerator: new adjective, two inspiring Computing Science authors
Upstream-commit: 09f5e9dae3b83ee9eaa09b8097134d5d4251fce8
Component: engine
2018-08-01 23:50:05 +02:00
6e92e59096
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-08-01 21:04:19 +00:00
ff8bdfb5f9
Merge component 'engine' from git@github.com:docker/engine master
2018-08-01 21:04:10 +00:00
1e5cba450a
Merge pull request #37489 from poizan42/fix-mips-no-pie
...
-buildmode=pie is not supported on Linux on MIPS either
Upstream-commit: 724c5f317e0aabb3fb95933e5dd95ab9d71b5cdb
Component: engine
2018-08-01 10:39:55 -07:00
7359851606
Merge pull request #126 from dhiltgen/image_build
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 1aa29931980e51171a57cae931de9cd17966dbb0
Component: packaging
2018-08-01 17:28:21 +00:00
c8b3283839
Merge component 'cli' from git@github.com:docker/cli master
2018-08-01 16:36:51 +00:00
ed3a613040
Merge pull request #1258 from wyckster/patch-2
...
Fixed wrong apostrophe character
Upstream-commit: 261ff66d61
Component: cli
2018-08-01 18:09:36 +02:00
691f30bc72
Fixed wrong apostrophe character
...
Changed unexpected Unicode character 0x1fbf GREEK PSILI that was standing in as an imposter for an apostrophe: an _impostrophe_.
Signed-off-by: Chad Faragher <wyckster@hotmail.com >
Upstream-commit: b59823c784
Component: cli
2018-08-01 11:06:07 -04:00
f232ca8480
Switch image name on hub
...
For the Q3 release the names will be refined slightly, and "ce" will no
longer be used - it's now just the docker engine, with "community" or
"enterprise" at the end if disambiguation is needed.
Upstream-commit: e69e4ea4997e468d20d93247ba19cd5e86daf24f
Component: packaging
2018-08-01 08:03:20 -07:00
52c1a41d81
Merge pull request #1249 from vdemeester/compose-template-pkg-enhancement
...
Add a new `ExtractVariables` function to `compose/template` package
Upstream-commit: da544e8938
Component: cli
2018-08-01 16:18:46 +02:00
0bdf126d62
Add a new ExtractVariables function to compose/template package
...
It allows to get easily all the variables defined in a
composefile (the `map[string]interface{}` representation that
`loader.ParseYAML` returns at least) and their default value too.
This commit also does some small function extract on substitution
funcs to reduce a tiny bit duplication.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: afb87e42f2
Component: cli
2018-08-01 16:12:49 +02:00
6951f936e1
Merge pull request #1256 from silvin-lubecki/update-reviewers
...
Remove outdated completion reviewers file
Upstream-commit: 2093fd6e52
Component: cli
2018-08-01 15:19:36 +02:00
d180792961
Remove outdated completion reviewers file
...
Clean maintainers and code owners files
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 9022a00fbe
Component: cli
2018-08-01 15:08:36 +02:00
b6bdcc10a5
Merge pull request #37485 from fcrisciani/resolv
...
Systemd-resolved proper handling
Upstream-commit: e1584514c15f6ad91b9ef5bc530a1eef46f18267
Component: engine
2018-08-01 14:52:33 +02:00
1e6a95f11f
Merge pull request #37522 from vdemeester/bump-some-deps
...
Bump a bunch of dependencies to more recent versions
Upstream-commit: 1dfcf4fe77e47d740939271aea516e11b5f9bcba
Component: engine
2018-08-01 13:45:30 +02:00
5483ae0078
Merge pull request #37573 from thaJeztah/windows-rs3-ci
...
Temporarily disable failing tests on Windows RS3
Upstream-commit: 27f663a2532bb1b4c7fc375f8597d08064ce1890
Component: engine
2018-08-01 12:16:12 +02:00
14dcb25448
Bump a bunch of dependencies to more recent versions
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b0d108aa6ba4a52db1dd2bba0fd512903ab725ca
Component: engine
2018-08-01 10:37:27 +02:00
546812f824
Merge pull request #37438 from adshmh/fix-flaky-test-TestRunContainerWithBridgeNone
...
fix the race condition in the integration test TestRunContainerWithBridgeNone
Upstream-commit: 9149ef67be8ac945d68fafb16a1aa4ccb2f72249
Component: engine
2018-08-01 09:57:29 +02:00
ba693dc4c7
Fix help message flags on docker stack commands and sub-commands
...
PersistentPreRunE needs to be called within the help function to initialize all the flags (notably the orchestrator flag)
Add an e2e test as regression test
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 21cce52b30
Component: cli
2018-08-01 01:48:27 +02:00
ef87b4e0a0
Temporarily disable failing tests on Windows RS3
...
Signed-off-by: John Stephens <johnstep@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1b05ea472703ddc47ec5052bc031fc23e60356c4
Component: engine
2018-07-31 23:49:36 +02:00