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

27689 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anusha Ragunathan
671d01aabf Merge pull request #27128 from anusha-ragunathan/plugin-shutdown 
Shutdown plugins after containers.
 2016-10-03 17:08:22 -07:00
Victor Vieux
f60727d185 Merge pull request #27121 from LK4D4/fix_import 
volume/local: fix import path
 2016-10-03 16:48:20 -07:00
Victor Vieux
bd57e6d25c Merge pull request #27126 from mlaventure/fix-tgz 
Remove amd64 assumption in release.sh, cross and tgz scripts
 2016-10-03 16:03:00 -07:00
Victor Vieux
0892a737d1 Merge pull request #27127 from vieux/revert_wrong_doc 
Revert "fix API doc service delete"
 2016-10-03 16:02:08 -07:00
Anusha Ragunathan
ed6e30767e Shutdown plugins after containers. 
Fixes #26278

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-10-03 15:52:44 -07:00
Kenfe-Mickael Laventure
61335bcb03 Remove amd64 assumption in release.sh, cross and tgz scripts 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-03 15:46:42 -07:00
Alexander Morozov
5af8cfd3b1 volume/local: fix import path 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-10-03 12:13:56 -07:00
Victor Vieux
94cd7ed72d Merge pull request #27119 from vieux/fix_doc_delete_service 
fix API doc service delete
 2016-10-03 12:03:45 -07:00
Brian Goff
8b416fb025 Merge pull request #26960 from allencloud/make-remove-cloudprovider-network-return-204 
make remove cloudprovider network return 204
 2016-10-03 14:46:11 -04:00
Brian Goff
ce64a9bffd Merge pull request #27085 from alexchenfeng/master 
add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT C…
 2016-10-03 14:23:07 -04:00
Michael Crosby
e22d4b9654 Merge pull request #27078 from darrenstahlmsft/InteractiveRestartTest 
Increase timeout in TestRunInteractiveWithRestartPolicy
 2016-10-03 11:22:33 -07:00
Brian Goff
7e29b33546 Merge pull request #26967 from AkihiroSuda/rename-tests 
[nit] integration-cli: obey Go's naming convention
 2016-10-03 09:52:04 -04:00
Tõnis Tiigi
675e622432 Merge pull request #27094 from allencloud/add-lock-in-libcontainerd-client 
add lock in libcontainerd client AddProcess
 2016-10-02 16:50:41 -07:00
Sebastiaan van Stijn
367d5b0232 Merge pull request #27097 from albers/completion-node-ps-multiple-nodes 
Add support for multiple nodes in bash completion for `docker node ps`
 2016-10-02 14:38:46 +02:00
Sebastiaan van Stijn
eca5ff194f Merge pull request #27096 from albers/completion-daemon--init-path 
Add bash completion for `dockerd --init-path`
 2016-10-02 14:37:13 +02:00
Vincent Demeester
420e22fad4 Merge pull request #27060 from yongtang/27021-inspect-show-env 
Disable HTML escaping for JSON strings in `docker inspect`
 2016-10-02 14:32:56 +02:00
Harald Albers
9aeb69a069 Add support for multiple nodes in bash completion for docker node ps 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-02 05:18:32 -07:00
Harald Albers
d710a3e1f8 Add bash completion for dockerd --init-path 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-02 05:10:00 -07:00
allencloud
278273bc16 add lock in libcontainerd client AddProcess 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-10-02 00:36:25 +08:00
allencloud
ea07ef7a7c make remove network return 204 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-10-01 19:50:40 +08:00
Sebastiaan van Stijn
762556c705 Merge pull request #26564 from miminar/prevent-blob-uploads 
Avoid unnecessary blob uploads
 2016-10-01 12:53:10 +02:00
Victor Vieux
bd99641466 Revert "fix API doc service delete" 
This reverts commit a12120e78c.

Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-01 02:12:41 -07:00
Vincent Demeester
6e8a2cd291 Merge pull request #27062 from yank1/Inconsistency-"on_failure"-vs-"on-failure" 
Fix conversion of restart-policy from GRPC
 2016-10-01 10:39:00 +02:00
Victor Vieux
a12120e78c fix API doc service delete 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-09-30 22:31:40 -07:00
Arnaud Porterie
86de7c000f Merge pull request #26108 from mlaventure/data-mngt 
New Data Management commands
 2016-10-01 03:17:18 +00:00
alexchen
4c74469d30 add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT CONFIG_IP_VS_RR in contrib/check-config.sh 
Signed-off-by: alexchen <alexchenunix@gmail.com>
 2016-10-01 09:50:17 +08:00
Michael Crosby
18338427ed Merge pull request #26968 from darrenstahlmsft/TestEventsFix 
Limit conccurent container creates in TestEventsLimit to 8
 2016-09-30 16:29:01 -07:00
Darren Stahl
6eac29490f Increase timeout in TestRunInteractiveWithRestartPolicy 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-09-30 15:30:18 -07:00
Brian Goff
6de38ebc4d Merge pull request #27075 from tonistiigi/copy-error-reporting 
Fix error reporting in `CopyFileWithTar`
 2016-09-30 18:14:13 -04:00
Darren Stahl
728a265190 Limit conccurent container creates in TestEventsLimit to 8 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-09-30 14:44:05 -07:00
Sebastiaan van Stijn
1b944a3025 Merge pull request #27049 from dnephin/fix-label-flag-type 
Use ListOpt for build labels
 2016-09-30 23:40:08 +02:00
Kenfe-Mickael Laventure
913e5cb77b Add documentation for container, volume, image and system prune subcommands 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-30 14:35:23 -07:00
Kenfe-Mickael Laventure
a860d5db45 Document new /system/df and /{containers,volumes,images}/prune API EndPoints 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-30 14:35:23 -07:00
Kenfe-Mickael Laventure
b650a7bd27 Add new df subcomand to the system command 
This command display the state of the data usage of the docker daemon.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-30 14:35:23 -07:00
Tonis Tiigi
57e12037ac Fix error reporting in CopyFileWithTar 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-09-30 11:46:37 -07:00
Brian Goff
d89fb40e1c Merge pull request #27072 from Microsoft/jjh/fix26843 
Windows: Don't resolve volume dest
 2016-09-30 14:46:07 -04:00
Michael Crosby
97660c6ec5 Merge pull request #26961 from Microsoft/jjh/oci 
Windows: OCI runtime spec compliance
 2016-09-30 10:13:57 -07:00
Michael Crosby
6eef2b2ada Merge pull request #26997 from tonistiigi/exec-env 
Fix missing hostname and links in exec env
 2016-09-30 09:51:02 -07:00
John Howard
3838c314ad Windows: Don't resolve volume dest 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-30 09:40:15 -07:00
Justin Cormack
50856a2ce2 Merge pull request #27051 from tophj-ibm/fix-installing-apparmor 
Fix apparmor profile installation
 2016-09-30 17:38:20 +01:00
Vincent Demeester
4fabc92cfc Merge pull request #26697 from allencloud/change-service-scale-logic 
validate service parameter in client side to avoid api call in `docker service scale`
 2016-09-30 18:37:35 +02:00
Vincent Demeester
c9a0dda586 Merge pull request #27059 from yongtang/26964-docs-service-ps-filter-misc 
Update docs for node filter of `docker service ps`
 2016-09-30 16:15:49 +02:00
Yong Tang
c326e0afe3 Update docs for node filter of docker service ps 
As is specified in 26964, it is possible to specify
a filter based on the node name or node ID.

This fix updates the related docs for that.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-30 05:37:14 -07:00
Kay Yan
bc32fcabeb Fix conversion of restart-policy from GRPC 
restart-condition for services from "on_failure" to "on-failure".

Since GRPC does not support dashes in properties, this change
added a conversion when _setting_ the restart-condition.

However, when inspecting a service, no conversion took place
from the internal GRPC value, resulting in "on_failure" to
be shown.

This change updates the conversion to fix this, and removes
a "hack" that was previously used for this, now using a
Switch to compare to actual types.

Before this change:

    docker service create --name web --restart-condition=on-failure nginx:alpine

    docker service inspect --format '{{ json .Spec.TaskTemplate.RestartPolicy }}' web
    {"Condition":"on_failure","MaxAttempts":0}

Afer this change:

    docker service create --name web --restart-condition=on-failure nginx:alpine

    docker service inspect --format '{{ json .Spec.TaskTemplate.RestartPolicy }}' web
    {"Condition":"on-failure","MaxAttempts":0}

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
 2016-09-30 15:54:47 +08:00
Akihiro Suda
7fb7a477d7 [nit] integration-cli: obey Go's naming convention 
No substantial code change.

 - Api         --> API
 - Cli         --> CLI
 - Http, Https --> HTTP, HTTPS
 - Id          --> ID
 - Uid,Gid,Pid --> UID,PID,PID
 - Ipam        --> IPAM
 - Tls         --> TLS (TestDaemonNoTlsCliTlsVerifyWithEnv --> TestDaemonTLSVerifyIssue13964)

Didn't touch in this commit:
 - Git: because it is officially "Git": https://git-scm.com/
 - Tar: because it is officially "Tar": https://www.gnu.org/software/tar/
 - Cpu, Nat, Mac, Ipc, Shm: for keeping a consistency with existing production code (not changable, for compatibility)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-30 01:21:05 +00:00
Yong Tang
0fa20ad13b Disable HTML escaping for JSON strings in docker inspect 
This fix tries to address the issue raised in 27021 where
HTML strings like (`&, >, <, etc`) in environmental variables
are escaped for JSON output for `docker inspect`. For example,
`TEST_ENV="soanni&rtr"` has been escaped to `TEST_ENV="soanni\u0026rtr"`

This fix disabled HTML escaping with `SetEscapeHTML`, which is available
since golang 1.7.0. This changes will be applied to all JSON output
that utilize `httputils.WriteJSON`.

An integration test has been added to cover the changes.

This fix fixes 27021.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-29 18:16:36 -07:00
Christopher Jones
1a702111c6
Fix apparmor profile installation 
Fixes #26823

Fixes an issue where apparmor was not loaded into the kernel, because
apparmor_parser was being called incorrectly.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-09-29 18:47:20 -05:00
Daniel Nephin
6c3b44f755 Use ListOpt for labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-29 17:59:52 -04:00
Tonis Tiigi
e981459609 Fix missing hostname and links in exec env 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-09-29 13:46:10 -07:00
Michael Crosby
1d669d82c1 Merge pull request #26994 from Microsoft/jjh/fix26461regression 
Windows: Don't set PATH/TERM on exec
 2016-09-29 13:34:12 -07:00