toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,311 Commits 3 Branches 295 Tags
74f20fa6066c00aa704d23454047a58e4790b26c
Commit Graph
26311 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Richardson 74f20fa606 Fix typo in run command documentation 
Signed-off-by: Kevin Richardson <kevin@kevinrichardson.co>
Upstream-commit: b3913024e252e9cb1e7cba75e3f95cb23cedaf9b
Component: engine
 2016-08-05 07:35:16 -04:00
Sebastiaan van Stijn af7b72a0f3 Merge pull request #25430 from padyx/doc_swarmjoin_conflictmarker 
Remove git conflict markers in docs/reference/commandline/swarm_join.md
Upstream-commit: 49819165460f12606cb96fc0e579cb4019e407da
Component: engine
 2016-08-05 10:48:19 +02:00
Patrick Böänziger 7c2f803204 Remove git conflict markers 
Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.com>
Upstream-commit: 34278b3301c0ca339d32a90264f0018e35a1e7e9
Component: engine
 2016-08-05 09:41:45 +02:00
Sebastiaan van Stijn 75a7c851a1 Merge pull request #25425 from thaJeztah/remove-rc-suffix 
Remove "-rc" from documentation
Upstream-commit: 9513aa3a48b6d4d7d612ddbdc097495bf48d9572
Component: engine
 2016-08-05 02:15:24 +02:00
Sebastiaan van Stijn 4183fa25d5 Remove "-rc" from documentation 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4f7b731a26bf43c03687fab35c2f30cfd827bade
Component: engine
 2016-08-05 01:38:18 +02:00
Sebastiaan van Stijn 92d5987c4e Merge pull request #25421 from avaid96/patch-1 
minor nit typo in opensl(openssl) genrsa -out delegation.key 2048
Upstream-commit: 4191b786c5a1741038561f79f7fb2790bcbd2b5a
Component: engine
 2016-08-05 00:33:37 +02:00
Avi Vaid 5a0f28bcec minor nit typo in opensl(openssl) genrsa -out delegation.key 2048 
Signed-off-by: Avi Vaid <avaid1996@gmail.com>
Upstream-commit: 570bad1974e767525ef513e48a0df19fc8b49e0c
Component: engine
 2016-08-04 15:07:20 -07:00
Alexander Morozov bcd928c83a Merge pull request #23902 from dnephin/inspect-to-cobra 
Convert inspect command to Cobra
Upstream-commit: 979d48bbf58599ecf236984463ae94ee59ba3b47
Component: engine
 2016-08-04 11:20:43 -07:00
Brian Goff 5820821c40 Merge pull request #25370 from thaJeztah/move-experimental-test 
Move TestInspectNamedMountPoint integrationtest from experimental
Upstream-commit: af51c9704c058f5a6545a6e5a27d7797f4cadab5
Component: engine
 2016-08-04 11:12:46 -04:00
Brian Goff a20f058def Merge pull request #25399 from ilkka/swarm-tutorial-service-ps-output 
Update `service ps` output format in swarm tutorial to match 1.12.0
Upstream-commit: e1b77bd69a0789652252b5a1b338839541250dc1
Component: engine
 2016-08-04 11:03:33 -04:00
Ilkka Laukkanen e9fa1f29b7 Fix service ps output format in swarm tutorial 
These changes update the example output for `docker service ps` in the
swarm tutorial's rolling update and node draining sections to match that
produced by 1.12.0: shutdown tasks are listed and the column order and
naming has changed.

Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io>
Upstream-commit: da56fa26990aa957c9bdc5497b9856f8aff58636
Component: engine
 2016-08-04 13:01:22 +03:00
Sebastiaan van Stijn 3ce44cb403 Merge pull request #25391 from sdurrheimer/zsh-completion-node-rm-force 
Add zsh completion for 'docker node rm --force'
Upstream-commit: 402cf238bf3da16a7b04ec2b911ca6a2097fa285
Component: engine
 2016-08-04 10:14:30 +02:00
Vincent Demeester b9fed96c04 Merge pull request #25384 from vieux/fix_wait_plugins 
fix deadlock when more than 1 plugin is installed
Upstream-commit: 5de2e6d7b8494e662a7b53c287dad25bc6139747
Component: engine
 2016-08-04 08:46:57 +02:00
Vincent Demeester e94630e5b6 Merge pull request #25385 from crosbymichael/test-improvements 
Test improvements to reduce time for long running tests
Upstream-commit: 73c597e5f216e84e5c0d7738c20c4134b225901b
Component: engine
 2016-08-04 08:44:32 +02:00
Steve Durrheimer ba54cb627c Add zsh completion for 'docker node rm --force' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b58ef479a6be7ddff79a354ee912f9dd73a9f41b
Component: engine
 2016-08-04 08:01:04 +02:00
Victor Vieux 3ef890484a fix deadlock when more than 1 plugin is installed 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 42360d164b9f25fb4b150ef066fcf57fa39559a7
Component: engine
 2016-08-03 16:22:12 -07:00
Tõnis Tiigi 51a2e7806a Merge pull request #25309 from cpuguy83/25253_fix_accidental_bind_create 
Validate mount paths on task create
Upstream-commit: e10f6a2e549cda2d4f8fc7ee23c91dc7a21bb967
Component: engine
 2016-08-03 15:54:03 -07:00
Michael Crosby 82e10dbf88 Decrease sleep to 2 seconds 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 94b1bb82e19242e87edfc688bb3d3c3c010d4603
Component: engine
 2016-08-03 15:25:27 -07:00
Michael Crosby 6cbe7c9c86 Change number of pings to 1 
This cuts the test time down from 6s to 2s

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cfde8e785582502b830238245ad69eae5394b4f0
Component: engine
 2016-08-03 13:30:34 -07:00
Michael Crosby c5d4a2d2e9 Make network stats version test concurrent 
This change makes the test run go down from 10s to 2s

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2f3b7f08a09d70bc17a75b00a81e56357a9cae3f
Component: engine
 2016-08-03 13:24:55 -07:00
Michael Crosby 4edb73517c Remove build 60 steps 
This test is already covered in the individual graph driver tests and it
adds 15s to the test run without adding value.  The original idea was to
test max number of layers, this is fulfilled by the graph drivers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 3ffa5f61494aa67434a9b408540a9efb32e332cf
Component: engine
 2016-08-03 13:16:01 -07:00
Sebastiaan van Stijn e730a09366 Merge pull request #23497 from shishir-a412ed/dm_task_run_failed 
Fixes Issue # 23418: Race condition between device deferred removal and resume device.
Upstream-commit: 87e48ecd048c0b083fe09fb8d74c83364abd41e6
Component: engine
 2016-08-03 21:54:33 +02:00
Tibor Vass 1c09d6a451 Merge pull request #25373 from thaJeztah/lift-dockerfile-moratoriom 
Remove Dockerfile syntax from frozen features
Upstream-commit: 6ebf816f8089ab66033354ce95c6057ed6dfcd15
Component: engine
 2016-08-03 11:45:17 -07:00
Tibor Vass f6a1b7c053 Merge pull request #25192 from dnephin/fix-manpages-on-arm 
Fix the man/Dockerfile for arm
Upstream-commit: 5e9102386795af3a71084d311d0c4fac31c0b345
Component: engine
 2016-08-03 10:45:53 -07:00
Sebastiaan van Stijn 18e680ce9c Merge pull request #24736 from johnharris85/fix-sinatra-tutorial 
Fix broken gem instructions.
Upstream-commit: 29648795cd3709063c0f4309148708bbb5a3e7bc
Component: engine
 2016-08-03 19:36:19 +02:00
Brian Goff f2a502a7a2 Merge pull request #25376 from sfsmithcha/fix_typo 
add missing period
Upstream-commit: f7d48d74a3dd44171d5e9dbcf33ba6de40baa08a
Component: engine
 2016-08-03 13:31:36 -04:00
Charles Smith 8df6fc8b2c add missing period 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 8bdb682205aa004cd4607945fdf48b41716eb6e1
Component: engine
 2016-08-03 09:51:09 -07:00
Daniel Nephin 9233ed872e Ignore 'not a swarm error' when inspecting a task. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fab2a3dc826ec05e7fb0dc66748b235fb4a43df6
Component: engine
 2016-08-03 12:22:07 -04:00
Sebastiaan van Stijn 7070385fc4 Remove Dockerfile syntax from frozen features 
As discussed on the maintainers mailinglist,
and during a maintainers review session;

We've recently made changes to the Dockerfile
syntax (e.g., `HEALTHCHECK`, `SHELL`), so
mentioning the Dockerfile syntax as a frozen
feature is no longer accurate.

Removing it from frozen features does NOT
automatically state an intent to make big
changes to the syntax; making changes
to the syntax are important decisions and
should never be taken lightly.

This change is just to indicate that we
can *accept* changes if they are meaningful,
and we're confident they can be made.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 07250457df03396ea61dbf3782b5f8cf1094e7e0
Component: engine
 2016-08-03 17:17:54 +02:00
Daniel Nephin bfaaeedf5b Convert inspect to cobra. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 851c388ad9aec0547ca7fde24c307b262eaab599
Component: engine
 2016-08-03 10:36:47 -04:00
Sebastiaan van Stijn 2c3746fbe6 Move TestInspectNamedMountPoint integrationtest from experimental 
This feature is no longer experimental, and should
now work on Windows too

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6f2e8205024ae259336d43f75169e9bb43de35a5
Component: engine
 2016-08-03 16:21:38 +02:00
Vincent Demeester 917c737de1 Merge pull request #25341 from tonistiigi/fix-pending-tests 
Fix swarm pending state tests
Upstream-commit: 4a94a6513be00d86bec691cfefa21a1c63aab8d9
Component: engine
 2016-08-03 16:12:43 +02:00
Vincent Demeester 4169a28639 Merge pull request #25329 from lixiaobing10051267/MasterBindVolume 
It is volume not binds for first arg in callDecodeContainerConfig()
Upstream-commit: d68253d19f06a6c4faaf27ae020082e4eee16461
Component: engine
 2016-08-03 16:10:37 +02:00
Sebastiaan van Stijn fdf76aabf0 Merge pull request #25194 from vdemeester/23597-swarm-api-ref-fixes 
Update `/node/*` api reference documentation
Upstream-commit: 0ab06816ea5887098039ba4ddecc964654335594
Component: engine
 2016-08-03 15:44:18 +02:00
Sebastiaan van Stijn d053f77745 Merge pull request #25366 from yongtang/08032016-man-docker-create-user-flag 
Update `--user`/`-u` flag in man page of `docker create`
Upstream-commit: e737e6a20455c90e2eb168d9a532c23c1ddbc1d6
Component: engine
 2016-08-03 15:29:25 +02:00
Vincent Demeester c39cadbef0 Update /node/* api reference documentation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 63d65505b28046f23a3cce4374e458720b76bc80
Component: engine
 2016-08-03 14:55:30 +02:00
Yong Tang 1c068e9f37 Update --user/-u flag in man page of docker create 
The `--user`/`-u` of the `docker create` is the same as
`docker run`, which could take either `uid` or `uid:gid`
format. However, the description in the man page of `docker create`
is missing and may cause some confusions (comared with `docker run`).

This fix updates the man page of `docker create` so that it is
consistent with the man page of `docker run`.

This fix is related to 25304.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 55478a2c3e267b6d0874cba719213d1a907b432e
Component: engine
 2016-08-03 05:36:07 -07:00
Vincent Demeester fe2b0130c3 Merge pull request #23422 from thaJeztah/skip-hidden-files 
deb: skip hidden files when generating indexes
Upstream-commit: cebdb89998d22816b69d928cd42c6a32f93a9412
Component: engine
 2016-08-03 14:31:33 +02:00
Sebastiaan van Stijn 765a0eacba deb: skip hidden files when generating indexes 
We don't need hidden files to be listed
in the indexes, so skip them if hidden
files exist.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 153c946b7923fda4d60ad735f2f9e02ffb150704
Component: engine
 2016-08-03 12:58:14 +02:00
Sebastiaan van Stijn 924dbe78bc Merge pull request #25359 from albers/completion-node-rm--force 
Add bash completion for `docker node rm --force`
Upstream-commit: 919257da66c2b654d823daa596fdb2f7964945c7
Component: engine
 2016-08-03 11:22:25 +02:00
Harald Albers 7e61c1351f Add bash completion for docker node rm --force 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 46d3464362f18a1eb6d37fc51b120d0f0614653a
Component: engine
 2016-08-03 11:08:28 +02:00
Sebastiaan van Stijn e2da5928d4 Merge pull request #25358 from lixiaobing10051267/masterBe 
Remove reduntant word in device-mapper-driver.md
Upstream-commit: 5c9bcaa9421699eb39df59cf12f9404bd4ebec82
Component: engine
 2016-08-03 10:21:39 +02:00
lixiaobing10051267 8c12ea3017 Remove reduntant word in device-mapper-driver.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 96c959ec6b80ff11c8dc8f6d9105b19b9c80899a
Component: engine
 2016-08-03 16:13:44 +08:00
Sebastiaan van Stijn e8e2bf82f9 Merge pull request #25346 from tonistiigi/mask-join-tokens 
Mask join tokens in daemon logs
Upstream-commit: cfd2719bf797d71dc790c0925b9512327880fb24
Component: engine
 2016-08-03 01:34:18 +02:00
Sebastiaan van Stijn 8274d135c7 Merge pull request #25350 from thaJeztah/carry-24314-mongodb-example-update 
[Carry 24314] Make MongoDB sample Dockerfile working again
Upstream-commit: 6e19e7b1d715ac5be4b1a7932b42c5a7eb99a9ad
Component: engine
 2016-08-03 01:27:26 +02:00
Maxim Fedchyshyn 90863c0a99 Make MongoDB sample Dockerfile working again 
There were couple issues in the previous version of this Dockerfile

1. [MongoDB manual](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-ubuntu/) uses 3.2 repo version as of July'16.
2.  Command `# lsb_release -sc`  doesn't work out of box, because of `bash: lsb_release: command not found`.

Signed-off-by: Maxim Fedchyshyn <sevmax@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 60f4c7dac389ac2cd152e4de092fe40fe86dd5c7
Component: engine
 2016-08-03 01:09:31 +02:00
Sebastiaan van Stijn df31e1724f Merge pull request #25349 from thaJeztah/carry-25174-api-docs-update 
[carry 25174] 409 status code result to create service
Upstream-commit: 2cb1281a4abe20f84cafa9d46f5660355e59ce44
Component: engine
 2016-08-03 01:04:36 +02:00
Daniel X Moore b99556d80d 409 status code result to create service 
Added example 409 status code result to the create service endpoint.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 397cc85643252b3882840d5df02189a166abf3a0
Component: engine
 2016-08-03 00:46:04 +02:00
Tonis Tiigi 86ea274c7e Mask join tokens in daemon logs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e3917c76ce6f75e6c12cd2099d403fdaba8ab218
Component: engine
 2016-08-02 15:15:23 -07:00
Brian Goff 4427fb747e Merge pull request #25345 from dperny/fix-service-inspect-pretty 
Fix missing newline in service inspect --pretty
Upstream-commit: 404705fd8e5465dd3e314d04c11cb299c195dd52
Component: engine
 2016-08-02 17:50:28 -04:00