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

25055 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arnaud Porterie
6d9d149f99 Merge pull request #23648 from thaJeztah/fix-overlay-overlay2 
fix "overlay" -> "overlay2" in error message
 2016-06-17 00:21:53 +00:00
Arnaud Porterie
7ef9aec90f Merge pull request #23570 from vdemeester/change-plugin-install 
Update docker plugin install code…
 2016-06-17 00:12:56 +00:00
Sebastiaan van Stijn
314d9dc03a Merge pull request #23646 from thaJeztah/update-docker-info 
Update docker info output example
 2016-06-16 16:45:44 -07:00
Sebastiaan van Stijn
2d4b285a75
fix "overlay" -> "overlay2" in error message 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-16 16:42:40 -07:00
Sebastiaan van Stijn
07e1c62bf4
Update docker info output example 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-16 16:29:23 -07:00
Michael Crosby
eb6cc31802 Merge pull request #23639 from mavenugo/ln-rc2 
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
 2016-06-16 16:17:07 -07:00
Vincent Demeester
4a70cb5571
Update ServiceInspectWithRaw 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-17 00:47:22 +02:00
Michael Crosby
2fa38a9144 Merge pull request #23641 from justincormack/s390seccomp 
Add the seccomp build tag for s390x now runc updated
 2016-06-16 15:46:14 -07:00
Vincent Demeester
2c82337b04
Update docker plugin install code… 
… for more consistency (api side).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-17 00:33:21 +02:00
Vincent Demeester
58529a1553
Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-17 00:32:58 +02:00
Michael Crosby
74c4834d32 Merge pull request #23624 from coolljt0725/fix_restore_sandbox 
check running again before restore active sandbox
 2016-06-16 15:24:58 -07:00
Justin Cormack
f8d970169a Add the seccomp build tag for s390x now runc updated 
This was waiting for runc bump see https://github.com/docker/docker/issues/23171
runc was bumped in https://github.com/docker/docker/pull/23603

Fixes #23171

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-16 23:21:08 +01:00
Tibor Vass
6b4e2ad90b Merge pull request #23520 from yongtang/23500-docker-info-security 
Add security info to `docker info`
 2016-06-16 15:15:33 -07:00
Tibor Vass
6dc58a1d58 Merge pull request #23640 from stevvooe/update-not-upate 
api/client/service: fix minor spelling error in service inspect
 2016-06-16 15:12:47 -07:00
Tibor Vass
06da8ce285 Merge pull request #23515 from HackToday/fixoverlay2 
Add ecryptfs check for overlay2
 2016-06-16 15:12:09 -07:00
Sebastiaan van Stijn
ef9c058b67 Merge pull request #23633 from thaJeztah/fix-advisory-meta 
docs: move "advisory" to  general metadata
 2016-06-16 14:55:11 -07:00
Stephen J Day
920e65ccbc
api/client/service: fix minor spelling error in service inspect 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-06-16 14:54:41 -07:00
Victor Vieux
348a7c790c Merge pull request #23537 from tiffanyfj/update-cli 
Capitalized Docker and Swarm for consistency
 2016-06-16 14:43:15 -07:00
Madhu Venugopal
262081557b Merge pull request #23635 from sainath14/network_id_missing 
Fixes #23596-returns empty string for NetworkID
 2016-06-16 14:38:51 -07:00
Tõnis Tiigi
70c7328d9e Merge pull request #23613 from stevvooe/running-over-replicas 
api/client/service: list running services over replicas
 2016-06-16 14:34:13 -07:00
Madhu Venugopal
7f2f6ed0d6 Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed 
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-06-16 14:33:36 -07:00
Tõnis Tiigi
6577031787 Merge pull request #23606 from vieux/fix_secrets 
fix docker swarm init/update --secret
 2016-06-16 14:24:35 -07:00
Tibor Vass
5d62f642d9 Merge pull request #23636 from crosbymichael/hang 
Set systemd KillMode
 2016-06-16 14:17:29 -07:00
Sebastiaan van Stijn
312749435b Merge pull request #23634 from thaJeztah/fix-api-menu-order 
Fix API 1.25 order in menu
 2016-06-16 13:31:32 -07:00
Tonis Tiigi
aed7667bee Add api tests for secret update 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 13:21:55 -07:00
Tibor Vass
e2feff465c Merge pull request #23491 from thaJeztah/update-release-instructions 
Update release script installation instructions
 2016-06-16 12:57:46 -07:00
Sainath Grandhi
ad85d29906 Fixes #23596-returns empty string for NetworkID in response to /containers/json 
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
 2016-06-16 12:34:00 -07:00
Victor Vieux
354f16e250 Merge pull request #23581 from dnephin/better-opt-strings 
Better output of default value for service option types
 2016-06-16 12:24:03 -07:00
Sebastiaan van Stijn
6891fead36
Fix API 1.25 order in menu 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-16 12:07:29 -07:00
Sebastiaan van Stijn
e233c8dd72
Update release script installation instructions 
Instructions for installing the static binaries
has changed, so updated the instructions.

The comment on top already requires the steps
to be executed as root, so removing the 'sudo'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-16 11:58:29 -07:00
Sebastiaan van Stijn
aadd88c306
docs: move "advisory" to general metadata 
the advisory option should not be
below "menu"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-16 11:52:34 -07:00
Michael Crosby
db435f526a Set systemd KillMode 
Change the kill mode to process so that systemd does not kill container
processes when the daemon is shutdown but only the docker daemon

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-06-16 11:46:04 -07:00
Alexander Morozov
1f3efe6776 Merge pull request #23609 from Microsoft/WindowsMemory 
Windows: Re-enabled support for memory limit
 2016-06-16 10:08:17 -07:00
Sebastiaan van Stijn
3acb0e4292 Merge pull request #23568 from adrianmoisey/patch-1 
Fix URL to issue
 2016-06-16 10:03:11 -07:00
Sebastiaan van Stijn
b62d5dfbf3 Merge pull request #23623 from SvenDowideit/fix-rc-advisory 
advisory can't be in the [menu] section
 2016-06-16 10:01:49 -07:00
Arnaud Porterie
3d69595a31 Merge pull request #23625 from talex5/fix-health-test 
Remove out-of-date health test
 2016-06-16 15:52:04 +00:00
Daniel Nephin
c26e7d8c91 Fix String() for some option types 
and add unit tests for them.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-16 10:09:14 -04:00
Thomas Leonard
18a59bb869 Remove out-of-date health test 
The test was waiting for the container to exit after failing its
healthcheck. However, we no longer automatically terminate containers,
so this waited instead for the container to time-out by itself.

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
 2016-06-16 13:09:57 +01:00
Sven Dowideit
bc033cb706 advisory can't be in the [menu] section 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-16 11:59:47 +00:00
Lei Jitang
78f3094518 Fix restore active sandbox 
we store the active sandbox after daemon.containerd.Restore, but there
is a chance the `Restore` will set the container to exit see
(https://github.com/docker/docker/blob/master/libcontainerd/client_linux.go#L469).
so we should check if the container is really running before add it to
activesandbox.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-06-16 07:54:36 -04:00
Vincent Demeester
6253c29494 Merge pull request #23583 from anusha-ragunathan/accept-perms 
Add accept-permissions flag for install.
 2016-06-16 12:44:37 +02:00
Vincent Demeester
0d8ad60e08 Merge pull request #23612 from icecrime/default_parallelism 
Service `--update-parallelism` defauls to 0
 2016-06-16 12:32:30 +02:00
Arnaud Porterie
e3ad63f7e4 Merge pull request #23582 from tophj-ibm/fix-typo-in-daemon-test 
Fix daemon test typo
 2016-06-16 05:22:50 +00:00
Arnaud Porterie
e65c5b603e Merge pull request #23572 from tombee/volume-opts-typo 
Change 'invald' to 'invalid' in volume opts errors
 2016-06-16 05:17:30 +00:00
Arnaud Porterie
78d624cfcd Merge pull request #23593 from justincormack/mlock 
Move mlock back into the default ungated seccomp profile
 2016-06-16 05:16:57 +00:00
Arnaud Porterie
9cdb6357e2 Merge pull request #23603 from mlaventure/revert-runc-to-mainstream 
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
 2016-06-16 05:08:44 +00:00
Stephen J Day
b86cb293ec
api/client/service: list running services over replicas 
To provide users a view of service status, list the number of running
task over the requested number of replicas.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-06-15 21:53:23 -07:00
Alexander Morozov
c18e036d36 Merge pull request #23577 from anusha-ragunathan/strings_conversion 
Avoid back and forth conversion between strings and bytes.
 2016-06-15 21:41:04 -07:00
Arnaud Porterie
8ab79f1f70 Merge pull request #23601 from dnephin/change_header 
Change SCALE to REPLICAS.
 2016-06-16 04:18:49 +00:00
Arnaud Porterie (icecrime)
f22d0174f3
Service --update-parallelism defauls to 0 
The `--update-parallelism` flaag should default to 0, which is
interpreted by the backend as unlimited. In other words, by default all
services should update simultaneously.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2016-06-15 21:13:04 -07:00