toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,841 Commits 3 Branches 295 Tags
a00daba2267ac8dbc5a3c5177d7ffdb6f5d47200
Commit Graph
29841 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester a00daba226 Merge pull request #29441 from coolljt0725/fix_update_restart_policy 
Fix docker update clear restart policy of monitor
Upstream-commit: 0f68ecd3f72ab336ffb6117ca9e9add9499309cf
Component: engine
 2016-12-19 10:30:04 +01:00
Sebastiaan van Stijn 6bbfbe0423 Merge pull request #29393 from lixiaobing10051267/masterDockerUpdate 
Add docker-update description ommitted in docker.1.md
Upstream-commit: 616adf1799af9a4815f74e39aabe4b2e352919c2
Component: engine
 2016-12-19 10:17:14 +01:00
Vincent Demeester 55338a0e87 Merge pull request #29510 from albers/docs-remove-node-ps--all 
Remove `--all|-a` from `docker node ps` reference
Upstream-commit: 309df6a59217852a8f1b14504ba064bbefb4727d
Component: engine
 2016-12-19 09:31:43 +01:00
lixiaobing10051267 0bd3a53491 Add docker-update description ommited in docker.1.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: c499ce266a86aaf7d3d0e45bac8e833bad5df126
Component: engine
 2016-12-19 15:13:51 +08:00
Michael 0fa3af8470 [docs,man] Fixed typo (#29516) 
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de>
Upstream-commit: e85bb788de950090c66e8501d294bd8b5e4e4723
Component: engine
 2016-12-18 19:55:09 -05:00
Sebastiaan van Stijn 55f7b33245 Merge pull request #29497 from yongtang/29486-docker-build-tmp-file 
Clean up tmp files for interrupted `docker build`
Upstream-commit: 6138a02c8739045a2f6dec85fd0d89db9bed43e5
Component: engine
 2016-12-18 23:59:00 +01:00
Vincent Demeester 84589be500 Merge pull request #29509 from albers/completion-remove-node-ps--all 
Remove bash completion for `docker node ps --all|-a`
Upstream-commit: c1c6b51a911c6c875c74675367588a043143c885
Component: engine
 2016-12-18 17:56:42 +01:00
Harald Albers 46f764687c Remove --all|-a from docker node ps reference 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 364e9002375fca1799180dd76e8074d922dd4044
Component: engine
 2016-12-18 06:47:54 -08:00
Harald Albers a931db0d48 Remove bash completion for docker node ps --all|-a 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a54cc4f88da67175938ac2a3d643e3de6cb4d4de
Component: engine
 2016-12-18 06:31:25 -08:00
Sebastiaan van Stijn 2b846c8a06 Merge pull request #28629 from yongtang/28581-secret-create-input 
Add `--file` flag for `docker secret create` command
Upstream-commit: 4436a5946d1cc20efb3af5a3d0c56894c02f1a29
Component: engine
 2016-12-18 03:04:10 +01:00
Sebastiaan van Stijn 214ffb7a47 Merge pull request #28160 from AkihiroSuda/update-experimental-md 
update experimental/README.md
Upstream-commit: f6ba8498a2ecd037bf3e42f27c009768ac9f9384
Component: engine
 2016-12-18 03:02:07 +01:00
Sebastiaan van Stijn bb420234b1 Merge pull request #29494 from thaJeztah/fix-powershell-dco-check 
fix powershell dco check
Upstream-commit: ee88de7385e374b05feaa510107513fbffbf3aad
Component: engine
 2016-12-17 21:34:51 +01:00
Sebastiaan van Stijn 8616ae37b9 Merge pull request #29423 from unclejack/api_cli_integ_return 
return directly without ifs in remaining packages
Upstream-commit: 21210419447281863f239805ab19248733041a52
Component: engine
 2016-12-17 21:30:47 +01:00
Yong Tang 4ee6d62486 Clean up tmp files for interrupted docker build 
This fix tries to fix the issue raised in 29486 where interrupted
`docker build` leaves some tmp files in `/var/lib/docker/tmp`.
With tmp file name prefixed with `/var/lib/docker/tmp/docker-builderXXXXXX`.

The reason for the issue is that in `MakeTarSumContext()`:
```
	if err := chrootarchive.Untar(sum, root, nil); err != nil {
		return nil, err
	}
```
the `err` is shadowed and caused the clean up function in `defer func()`
not being called.

This fix fixes the issue.

This fix is tested manually, as was specified in 29486:
```
rm -rf /var/lib/docker/tmp

mkdir repro && cd repro
fallocate -l 300M bigfile

cat > Dockerfile <<EOF
FROM scratch
COPY ./bigfile /
EOF

docker build .
{Cancel}

ls -la /var/lib/docker/tmp
```

This fix fixes 29486.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 847564fa49b27af508a02a371583019482534d31
Component: engine
 2016-12-16 21:11:53 -08:00
Lei Jitang 4b72b6dab3 Fix update clear the restart policy of monitor 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 737b5b1781da9d7f286bb2425720add0ff69e3e3
Component: engine
 2016-12-16 20:57:05 -05:00
Aaron Lehmann 035a86c3f5 Merge pull request #29439 from lixiaobing10051267/masterWalk 
rectify function and variable referred in pkg/archive/changes_linux.go
Upstream-commit: 545b97e6bc0f7e1be4e7f54604389d7584dc9658
Component: engine
 2016-12-16 17:25:09 -08:00
Tõnis Tiigi edc130fb68 Merge pull request #29456 from cpuguy83/fix_client_events_race 
Fixes a race condition in client events monitoring
Upstream-commit: 8a8416ccbdaf08598f4ac38255e4267859682bb9
Component: engine
 2016-12-16 17:07:43 -08:00
Sebastiaan van Stijn 5906dd918b Merge pull request #29459 from yongtang/29365-follow-up 
Allow containers to continue even if mount failed after live restore
Upstream-commit: 110a95717d2d7e140c139a9f6b8fb7f72ec20dcb
Component: engine
 2016-12-17 01:46:25 +01:00
Sebastiaan van Stijn 42f938d12c fix powershell dco check 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 611a633ba4e11215a23d8b405a537346b10d9657
Component: engine
 2016-12-16 23:48:27 +01:00
Vincent Demeester 0b16fc446e Merge pull request #29003 from dnephin/pkg-compose-transform 
Move composefile -> engine api type conversion to `cli/compose/convert`
Upstream-commit: 914a72541fecfc2e4312015befb7200dd05f4462
Component: engine
 2016-12-16 23:34:41 +01:00
Victor Vieux f906f0f7d4 Merge pull request #29042 from cpuguy83/fix_volume_plugin_refcounts 
Fix volume plugin refcounting on daemon restart
Upstream-commit: 4f57b94f0ce33564c0f474b807a61558e8592f15
Component: engine
 2016-12-16 10:54:30 -08:00
Aaron Lehmann 9691034423 Merge pull request #29482 from thaJeztah/not-for-workers-only 
swarm leave is not only for workers
Upstream-commit: 87e8828dffb29c351486e1e286c597cef238c5d1
Component: engine
 2016-12-16 09:48:35 -08:00
Daniel Nephin c9e434865c Move pkg to cli/compose/convert 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 643fd775edb0a05d649f4d484e966428eb3a6b09
Component: engine
 2016-12-16 12:27:31 -05:00
Daniel Nephin 8d30926318 More unit tests for converting services in stack deploy 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4664dd06f1184d11c62de8a4e5e6653ed26c3790
Component: engine
 2016-12-16 12:20:07 -05:00
Daniel Nephin 930d936818 Move ConvertService to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 655e48e65309f0191bbbb8b2e9730b6976e148cd
Component: engine
 2016-12-16 12:20:07 -05:00
Daniel Nephin cb4b458233 Move ConvertVolumes to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7685e80fc9cb79206d81757eee071f0244323600
Component: engine
 2016-12-16 11:51:13 -05:00
Daniel Nephin 20aacdd131 Move ConvertNetworks to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6b778c96336fe9c0bcfea477092aab8cdfc0c896
Component: engine
 2016-12-16 11:51:13 -05:00
Sebastiaan van Stijn 588ffd020c Merge pull request #29434 from yuexiao-wang/pause-and-unpause 
Fix inconsistency for pause and unpause
Upstream-commit: ba76c9214dbbc5d6276a20136eb3c454a1aa0969
Component: engine
 2016-12-16 16:42:04 +01:00
Brian Goff 343586bbdc Fix volume plugin refecounting on daemon restart 
Ensures all known volumes (known b/c they are persisted to disk) have
their volume drivers refcounted properly.

In testing this, I found an issue with `--live-restore` (required since
currently the provided volume plugin doesn't keep state on restart)
where restorted plugins did not have a plugin client loaded causing a
panic when trying to use the plugin.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6ef1060cd0acb847e06db890abb335faa837a9e2
Component: engine
 2016-12-16 10:14:06 -05:00
Brian Goff 1c3f338fb3 Fixes a race condition in client events monitoring 
In cases where there is high latency (ie, not-local network)
`waitExitOrRemoved` was not receiving events for short-lived containers.
This caused the client to hang while waiting for a notification that the
container has stopped.

This happens because `client.Events()` returns immediately and spins a
goroutine up to process events. The problem here is it returns before
the request to the events endpoint is even made.
Even without high-latency issues, there is no guarantee that the
goroutine is even scheduled by the time the function returns.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 47585996bf72bcfde9ef058522059bef352e83e0
Component: engine
 2016-12-16 10:11:53 -05:00
Sebastiaan van Stijn 148f65373a swarm leave is not only for workers 
the "docker swarm leave" command description
mentioned that the command can only be used
for workers, however, the command can also
be used for managers (using the `-f` / `--force`
option).

this patch removes the "(workers only)" part
of the command description.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f89eee5d9d3c01bc6d498fcb1163ec199e6c3078
Component: engine
 2016-12-16 15:10:20 +01:00
Sebastiaan van Stijn c9c422e83a Merge pull request #29455 from andrewhsu/f23-eol 
Remove fedora-23 because eol
Upstream-commit: e43566565887f58edf3b2eb1bf43ca9e6846bfc1
Component: engine
 2016-12-16 12:40:26 +01:00
Vincent Demeester c0af0489e6 Merge pull request #29474 from yuexiao-wang/add-link-node 
Add the whole related information for node
Upstream-commit: ddcb9996211fb0a2f33e35bc094a2fcfd12edf08
Component: engine
 2016-12-16 11:26:16 +01:00
yuexiao-wang 668e4bdf14 Add the whole related information for node 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b67b0949ed4b528fef6c3dc059a4bd16d5f2a929
Component: engine
 2016-12-16 22:21:52 +08:00
Sebastiaan van Stijn 847dc629c8 Merge pull request #27938 from AkihiroSuda/ovlnw-27866 
api: allow NW name that is the prefix of a swarm NW ID
Upstream-commit: 92e63977d9ed258c905ea5d073f9e04f631471f4
Component: engine
 2016-12-16 10:40:46 +01:00
yuexiao-wang b689c13fe1 Fix inconsistency for pause and unpause 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 082f4919cac55f32674874d96d82a310f6b1522d
Component: engine
 2016-12-16 17:27:28 +08:00
Vincent Demeester c936f080d2 Merge pull request #29462 from vieux/fix_devices_plugins 
fix devices in plugins
Upstream-commit: e9d403ab365ce1930e38756bfbf31d1986447387
Component: engine
 2016-12-16 08:03:15 +01:00
lixiaobing10051267 ec888ed9cd rectify function and variable referred in pkg/archive/changes_linux.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: e5ada578c3b0b554b5d996127ac6f5803cdb9431
Component: engine
 2016-12-16 14:58:47 +08:00
Akihiro Suda 242631630a update experimental/README.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: eb11a10ddf5169c8c761005ebd921505fdb309a4
Component: engine
 2016-12-16 04:03:02 +00:00
Victor Vieux 6675fa1137 Merge pull request #29302 from cpuguy83/graphdriver_plugin_use_propagated_mount 
Make graphdriver plugin use plugin BasePath
Upstream-commit: a59625d912c5596f1ba0bf12cdaac227b5234614
Component: engine
 2016-12-15 18:53:03 -08:00
Yong Tang 7b8a80a706 Allow containers to continue even if mount failed after live restore 
This fix is a follow up to #29365. In #29365 a bug was fixed for
`docker exec -u user` after live restore by remounting.
However, #29365 will prevent containers from restored if mount failed.

In this fix, containers will be restored even if mount in that step failed.
Some functionalities might be missing (like `docker exec -u user`) but
at least it is possible to do certain operations like stop/restart/delete.

This fix is related to #29365.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 3003ae1d8bd112e78bcc8c1c70efd9d3ef6f0ddc
Component: engine
 2016-12-15 15:48:14 -08:00
Victor Vieux eff605432a fix devices in plugins 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6f00601c9fb7886547334f80a250bac5e226aad7
Component: engine
 2016-12-15 15:35:53 -08:00
Sebastiaan van Stijn dd09f146eb Merge pull request #29446 from ddingel/s390_slim_dockerfile 
Dockerfile.s390x: Change base to debian jessie
Upstream-commit: 5e176022f4e48f818060689d3b085727bc26526f
Component: engine
 2016-12-15 23:47:17 +01:00
Sebastiaan van Stijn 529749c0f0 Merge pull request #29437 from yuexiao-wang/remove-unuse-slice 
Remove unuse slice in registry
Upstream-commit: d52494252dd4f677c9e75c6540175d033da9dcb1
Component: engine
 2016-12-15 22:23:01 +01:00
Brian Goff b70f98ab3e Make graphdriver plugin use plugin BasePath 
Also enables `PropagatedMount` for graphdrivers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 500210475f6d841b2eacb42fb495e90108db2733
Component: engine
 2016-12-15 16:22:13 -05:00
Tibor Vass a0d7d8f97c Merge pull request #29457 from tiborvass/poule_fix_docker_service 
poule: do not treat "docker service" keyword as a swarm feature
Upstream-commit: 8899c62ecfe74f5d08ab35d137b254a6674f220b
Component: engine
 2016-12-15 11:07:55 -08:00
Tibor Vass 9aea8838d5 poule: do not treat "docker service" keyword as a swarm feature 
"docker service" can also refer to an init system's service named docker
This would prevent labeling e.g. systemd related issues to swarm.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 59ca288c890393214832938aaf48c476574a0346
Component: engine
 2016-12-15 10:41:54 -08:00
Andrew Hsu 29ad604435 remove fedora-23 because eol 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: ef98091a901cd9926d307ed622de088c90da2ef3
Component: engine
 2016-12-15 09:44:34 -08:00
yuexiao-wang 36b9fe6ae8 Remove unuse slice in registry 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 3ed06f96706887e491f8acdb72c5704022504fa9
Component: engine
 2016-12-16 00:51:10 +08:00
Akihiro Suda 1f59facb6e api: allow creating a network of which name is the prefix of the ID of a swarm network 
Previously, it doesn't allow creating such a network:

e.g.

    $ docker network inspect -f '{{.Id}}' ingress
    84xh9knigj6zyt00u31e26nj3
    $ docker network create 84
    Error response from daemon: network with name 84 already exists

Fix #27866

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: edfbc3b8767ab2e89e73ba3142d2ddad295001e9
Component: engine
 2016-12-15 15:09:06 +00:00