beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29818 commits 14 branches 412 tags 338 MiB
Commit graph

29818 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
110a95717d Merge pull request #29459 from yongtang/29365-follow-up 
Allow containers to continue even if mount failed after live restore
 2016-12-17 01:46:25 +01:00
Vincent Demeester
914a72541f Merge pull request #29003 from dnephin/pkg-compose-transform 
Move composefile -> engine api type conversion to `cli/compose/convert`
 2016-12-16 23:34:41 +01:00
Victor Vieux
4f57b94f0c Merge pull request #29042 from cpuguy83/fix_volume_plugin_refcounts 
Fix volume plugin refcounting on daemon restart
 2016-12-16 10:54:30 -08:00
Aaron Lehmann
87e8828dff Merge pull request #29482 from thaJeztah/not-for-workers-only 
swarm leave is not only for workers
 2016-12-16 09:48:35 -08:00
Daniel Nephin
643fd775ed Move pkg to cli/compose/convert 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-16 12:27:31 -05:00
Daniel Nephin
4664dd06f1 More unit tests for converting services in stack deploy 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-16 12:20:07 -05:00
Daniel Nephin
655e48e653 Move ConvertService to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-16 12:20:07 -05:00
Daniel Nephin
7685e80fc9 Move ConvertVolumes to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-16 11:51:13 -05:00
Daniel Nephin
6b778c9633 Move ConvertNetworks to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-16 11:51:13 -05:00
Sebastiaan van Stijn
ba76c9214d Merge pull request #29434 from yuexiao-wang/pause-and-unpause 
Fix inconsistency for pause and unpause
 2016-12-16 16:42:04 +01:00
Brian Goff
6ef1060cd0 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>
 2016-12-16 10:14:06 -05:00
Sebastiaan van Stijn
f89eee5d9d
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>
 2016-12-16 15:10:20 +01:00
Sebastiaan van Stijn
e435665658 Merge pull request #29455 from andrewhsu/f23-eol 
Remove fedora-23 because eol
 2016-12-16 12:40:26 +01:00
Vincent Demeester
ddcb999621 Merge pull request #29474 from yuexiao-wang/add-link-node 
Add the whole related information for node
 2016-12-16 11:26:16 +01:00
yuexiao-wang
b67b0949ed Add the whole related information for node 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-16 22:21:52 +08:00
Sebastiaan van Stijn
92e63977d9 Merge pull request #27938 from AkihiroSuda/ovlnw-27866 
api: allow NW name that is the prefix of a swarm NW ID
 2016-12-16 10:40:46 +01:00
yuexiao-wang
082f4919ca Fix inconsistency for pause and unpause 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-16 17:27:28 +08:00
Vincent Demeester
e9d403ab36 Merge pull request #29462 from vieux/fix_devices_plugins 
fix devices in plugins
 2016-12-16 08:03:15 +01:00
Victor Vieux
a59625d912 Merge pull request #29302 from cpuguy83/graphdriver_plugin_use_propagated_mount 
Make graphdriver plugin use plugin BasePath
 2016-12-15 18:53:03 -08:00
Yong Tang
3003ae1d8b 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>
 2016-12-15 15:48:14 -08:00
Victor Vieux
6f00601c9f fix devices in plugins 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-12-15 15:35:53 -08:00
Sebastiaan van Stijn
5e176022f4 Merge pull request #29446 from ddingel/s390_slim_dockerfile 
Dockerfile.s390x: Change base to debian jessie
 2016-12-15 23:47:17 +01:00
Sebastiaan van Stijn
d52494252d Merge pull request #29437 from yuexiao-wang/remove-unuse-slice 
Remove unuse slice in registry
 2016-12-15 22:23:01 +01:00
Brian Goff
500210475f Make graphdriver plugin use plugin BasePath 
Also enables `PropagatedMount` for graphdrivers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-12-15 16:22:13 -05:00
Tibor Vass
8899c62ecf Merge pull request #29457 from tiborvass/poule_fix_docker_service 
poule: do not treat "docker service" keyword as a swarm feature
 2016-12-15 11:07:55 -08:00
Tibor Vass
59ca288c89 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>
 2016-12-15 10:41:54 -08:00
Andrew Hsu
ef98091a90 remove fedora-23 because eol 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2016-12-15 09:44:34 -08:00
yuexiao-wang
3ed06f9670 Remove unuse slice in registry 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-16 00:51:10 +08:00
Akihiro Suda
edfbc3b876 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>
 2016-12-15 15:09:06 +00:00
Sebastiaan van Stijn
e9a69316b8 Merge pull request #29383 from yuexiao-wang/add-logs-link 
Add the link for service logs
 2016-12-15 13:23:18 +01:00
yuexiao-wang
54d38fe115 Add the link for service logs 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-15 17:43:51 +08:00
Dominik Dingel
1bd6836a42 Dockerfile.s390x: Change base to debian jessie 
With commit ee59f25c2d we changed from
gcc-go to golang 1.7. By switching to debian we can reduce the base
layer from 1.4 GB to around 130 MB.

Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
 2016-12-15 10:40:33 +01:00
Vincent Demeester
6e6016f581 Merge pull request #29422 from unclejack/daemon_return_directly 
daemon: return directly without ifs where possible
 2016-12-15 09:46:53 +01:00
Vincent Demeester
31eea90f52 Merge pull request #29419 from trapier/reference_service_create_typo 
fix typo in reference for service create
 2016-12-15 09:45:17 +01:00
Vincent Demeester
aac75aca77 Merge pull request #29412 from albers/docs-network-create--attachable 
Add docs for `docker network create --attachable`
 2016-12-15 09:44:20 +01:00
Vincent Demeester
d0ab04ac16 Merge pull request #29372 from tophj-ibm/fix-plugin-disable-error 
[plugins] return err when failing remove
 2016-12-15 09:18:35 +01:00
Vincent Demeester
a60be6bfe3 Merge pull request #29365 from yongtang/29342-exec-user-after-restart 
Fix `docker exec -u` issue after docker daemon restart
 2016-12-15 09:16:17 +01:00
Akihiro Suda
ec8b286dd3 Merge pull request #29391 from lixiaobing10051267/masterTypeWin 
fix some typos in libcontainer\types_windows.go
 2016-12-15 13:26:58 +09:00
Victor Vieux
9a30560fda Merge pull request #29413 from albers/completion-deploy-experimental 
Make bash completion for `docker stack deploy --bundle-file` available only in experimental mode
 2016-12-14 17:24:50 -08:00
Tibor Vass
ba368baea1 Merge pull request #29156 from aaronlehmann/trusted-service-create 
Content trust for swarm services
 2016-12-14 16:04:50 -08:00
Christopher Jones
fb11164c4f
[plugins] return err when failing remove 
Fixes a case where removing the plugin from disk would
fail silently. Also moves pluginStore remove after we
remove from disk, so 'docker plugin ls' doesn't isn't
empty in case it errors out.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-12-14 15:10:29 -06:00
unclejack
3a42518042 daemon: return directly without ifs where possible 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2016-12-14 22:36:58 +02:00
Phil Estes
8415aeb39a Merge pull request #29366 from unclejack/pkg_return_directly 
pkg: return directly without ifs where possible
 2016-12-14 21:20:26 +01:00
Trapier Marshall
90c680ad25 fix typo in reference for service create 
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
 2016-12-14 14:56:55 -05:00
Anusha Ragunathan
738769d23c Merge pull request #29380 from vieux/skip_empty_network_plugin 
skip empty networks in plugin install
 2016-12-14 11:53:42 -08:00
Aaron Lehmann
62cd3b39f9 integration-cli: Add integration tests for swarm services + content trust 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-14 10:50:23 -08:00
Aaron Lehmann
d4d6f8c0d0 cli: Pin image to digest using content trust 
Implement notary-based digest lookup in the client when
DOCKER_CONTENT_TRUST=1.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-14 10:49:33 -08:00
Aaron Lehmann
4b8c79f25e cli: Split out GetNotaryRepository and associated functions 
Split these into cli/trust so that other commands can make use of them.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-14 10:49:32 -08:00
Kenfe-Mickaël Laventure
b6f870a278 Merge pull request #29387 from vicamo/add-debian-security-updates-when-available 
mkimage: add debian security updates source when available
 2016-12-14 09:54:50 -08:00
Sebastiaan van Stijn
2fe62f2395 Merge pull request #28943 from vdemeester/publish-long-short-syntax 
Remove --port and update --publish for services to support syntaxes
 2016-12-14 17:55:48 +01:00