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

25237 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Arnaud Porterie
17bf13b1b2 Merge pull request #23558 from mlaventure/fix-arm-test-for-multiple-runtimes 
Fix TestRunWithRuntime* on arm
 2016-06-16 04:09:15 +00:00
Tõnis Tiigi
18a20c859f Merge pull request #23602 from crosbymichael/bump-libnetwork 
Update libnetwork to 96d45528599c32354230480a1ebc0
 2016-06-15 19:01:29 -07:00
Sven Dowideit
1ba9e3cba4 Merge pull request #23604 from londoncalling/getstarted-tutorial-updates 
fixing links, images and missing files in Getting Started tutorial
 2016-06-16 11:50:28 +10:00
Victoria Bialas
1d80f8ca19 fixing links and merge conflicts 
updated link to faqs/troubleshoot to point to new location /toolbox

fixed docker-for-mac link error

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-06-15 18:37:50 -07:00
Sebastiaan van Stijn
0c78a7dd64 Merge pull request #23510 from sbose78/23376-update-centos-yum-repo-version 
Fixes #23376 Broken URL for Centos yum repo for docker fixed to harcoded version number.
 2016-06-16 02:43:13 +02:00
Victor Vieux
a579ce8ed3 use same hash for same secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-15 17:20:18 -07:00
Darren Stahl
12fe27a408 Windows: Added support for memory limit 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-06-15 17:07:29 -07:00
Victor Vieux
085895342c fix docker swarm init/update --secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-15 17:05:10 -07:00
Anusha Ragunathan
a2d48c9e4e Add basic integration tests for plugins. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-06-15 15:19:19 -07:00
Kenfe-Mickael Laventure
b675124cf5 Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-15 15:11:50 -07:00
Michael Crosby
e927df7b4b Update libnetwork to 96d45528599c32354230480a1ebc0 
This fixes an issue with hanging tests due to store.

Fixes #23560

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-06-15 15:07:04 -07:00
Daniel Nephin
4df0349948 Change SCALE to REPLICAS. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-15 17:57:59 -04:00
Arnaud Porterie
eab3a1fa55 Merge pull request #23565 from SvenDowideit/fix-links-tutorials 
fix links for #23505
 2016-06-15 21:24:22 +00:00
Justin Cormack
bdf01cf5de Move mlock back into the default ungated seccomp profile 
Do not gate with CAP_IPC_LOCK as unprivileged use is now
allowed in Linux. This returns it to how it was in 1.11.

Fixes #23587

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 16:25:27 -04:00
Brian Goff
011774e6f0 Merge pull request #23542 from mavenugo/aliases 
Use service alias and configure service VIP or dns-rr
 2016-06-15 16:18:50 -04:00
Brian Goff
8510adf8c8 Merge pull request #23579 from tonistiigi/fix-ci-hang 
Fix hanging integration tests
 2016-06-15 14:49:54 -04:00
Anusha Ragunathan
ec4857da48 Add accept-permissions flag for install. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-06-15 10:58:43 -07:00
Alexander Morozov
64eb01caf6 Merge pull request #23538 from anusha-ragunathan/incremental-builds 
Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
 2016-06-15 10:53:31 -07:00
Christopher Jones
51c0c6212d
Fix test typo 
Changes daemn to daemon

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-06-15 13:45:25 -04:00
Brian Goff
dfd9187305 Implement plugin restore after daemon restart 
This ensures that:

- The in-memory plugin store is populated with all the plugins
- Plugins which were active before daemon restart are active after.
  This utilizes the liverestore feature when available, otherwise it
  manually starts the plugin.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-06-15 13:39:33 -04:00
Tonis Tiigi
22f827abab Fix hanging integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-15 10:19:45 -07:00
Arnaud Porterie
480d7b310b Merge pull request #23301 from runcom/tmpfs-trump 
daemon: allow tmpfs to trump over VOLUME(s)
 2016-06-15 17:11:00 +00:00
Anusha Ragunathan
d6d448aab8 Avoid back and forth conversion between strings and bytes. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-06-15 09:55:40 -07:00
Brian Goff
5e156fd3d4 Fix removing plugins 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-06-15 11:21:31 -04:00