51ddeadfa4
Merge pull request #23537 from tiffanyfj/update-cli
...
Capitalized Docker and Swarm for consistency
Upstream-commit: 348a7c790cca349d110bb76dfd6522cbd6579ea3
Component: engine
2016-06-16 14:43:15 -07:00
611e95b628
Merge pull request #23635 from sainath14/network_id_missing
...
Fixes #23596-returns empty string for NetworkID
Upstream-commit: 262081557b8ef9d4c0244170152fa9bee8962166
Component: engine
2016-06-16 14:38:51 -07:00
40a223da0a
Merge pull request #23613 from stevvooe/running-over-replicas
...
api/client/service: list running services over replicas
Upstream-commit: 70c7328d9e97ab271bd4529480bdc7cc202faccf
Component: engine
2016-06-16 14:34:13 -07:00
7b4f900246
Merge pull request #23606 from vieux/fix_secrets
...
fix docker swarm init/update --secret
Upstream-commit: 657703178798ac497a82c16b4fd9f1c0728c60f9
Component: engine
2016-06-16 14:24:35 -07:00
0c8b7ed055
Merge pull request #23636 from crosbymichael/hang
...
Set systemd KillMode
Upstream-commit: 5d62f642d91e5ef3a751a41be8924e861beceb7f
Component: engine
2016-06-16 14:17:29 -07:00
5dd25b20b2
Merge pull request #23634 from thaJeztah/fix-api-menu-order
...
Fix API 1.25 order in menu
Upstream-commit: 312749435b2415aeb14f21c89ccd9e3aeb833455
Component: engine
2016-06-16 13:31:32 -07:00
f2801c549b
Add api tests for secret update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: aed7667bee243b0e0d1aa480e3bb52bae894cfe5
Component: engine
2016-06-16 13:21:55 -07:00
84d615e247
Merge pull request #23491 from thaJeztah/update-release-instructions
...
Update release script installation instructions
Upstream-commit: e2feff465c737f611a48420fc4c5b38b2c897d88
Component: engine
2016-06-16 12:57:46 -07:00
fc39b62384
Fixes #23596-returns empty string for NetworkID in response to /containers/json
...
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com >
Upstream-commit: ad85d299066e87cd40afc43ffee8cb73dcc79eb4
Component: engine
2016-06-16 12:34:00 -07:00
64bc8958f7
Merge pull request #23581 from dnephin/better-opt-strings
...
Better output of default value for service option types
Upstream-commit: 354f16e25062a283b077f6fa414e61abbdffe074
Component: engine
2016-06-16 12:24:03 -07:00
c0b4786bbf
Fix API 1.25 order in menu
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6891fead3675a31a9a98a0f19a80c96ebc393afd
Component: engine
2016-06-16 12:07:29 -07:00
f500e226f4
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 >
Upstream-commit: e233c8dd7208b358b950731a6ba93cf9dcb80eb5
Component: engine
2016-06-16 11:58:29 -07:00
55c05646ce
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 >
Upstream-commit: db435f526ac5703276ad1add28188c0c8c6e4c2a
Component: engine
2016-06-16 11:46:04 -07:00
b088238272
Merge pull request #23609 from Microsoft/WindowsMemory
...
Windows: Re-enabled support for memory limit
Upstream-commit: 1f3efe67764b6f8616dd12271747863c17f36f30
Component: engine
2016-06-16 10:08:17 -07:00
b1012f71f3
Merge pull request #23568 from adrianmoisey/patch-1
...
Fix URL to issue
Upstream-commit: 3acb0e4292b23a30fd949e473ba798e2c343d869
Component: engine
2016-06-16 10:03:11 -07:00
7f85b4490c
Merge pull request #23623 from SvenDowideit/fix-rc-advisory
...
advisory can't be in the [menu] section
Upstream-commit: b62d5dfbf3cf1be01df376334ed9f896030c1bd1
Component: engine
2016-06-16 10:01:49 -07:00
1c213e077b
Merge pull request #23625 from talex5/fix-health-test
...
Remove out-of-date health test
Upstream-commit: 3d69595a3189d15aaab82b0721508e640b26ccd0
Component: engine
2016-06-16 15:52:04 +00:00
8220c21f1c
Fix String() for some option types
...
and add unit tests for them.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c26e7d8c9105e16048268a01dd1e556af43902cd
Component: engine
2016-06-16 10:09:14 -04:00
c4c90efda6
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 >
Upstream-commit: 18a59bb8691c6f6f6a7a86f56bbcfc5418509ed8
Component: engine
2016-06-16 13:09:57 +01:00
e787e67ec5
advisory can't be in the [menu] section
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: bc033cb706fd22e3934968b0dfdf93da962e36a8
Component: engine
2016-06-16 11:59:47 +00:00
5445763ee1
Merge pull request #23583 from anusha-ragunathan/accept-perms
...
Add accept-permissions flag for install.
Upstream-commit: 6253c294947ef8ec64092bb612aafa45ff07f076
Component: engine
2016-06-16 12:44:37 +02:00
d1beb37828
Merge pull request #23612 from icecrime/default_parallelism
...
Service `--update-parallelism` defauls to 0
Upstream-commit: 0d8ad60e086aa48dd16fbae3bfdf842d3b974c5a
Component: engine
2016-06-16 12:32:30 +02:00
de87bc9acb
Merge pull request #23582 from tophj-ibm/fix-typo-in-daemon-test
...
Fix daemon test typo
Upstream-commit: e3ad63f7e44775335603ed23d34e1369eb2452b0
Component: engine
2016-06-16 05:22:50 +00:00
dea0c27b09
Merge pull request #23572 from tombee/volume-opts-typo
...
Change 'invald' to 'invalid' in volume opts errors
Upstream-commit: e65c5b603e71245ffb2c2630fe986865d4d70f46
Component: engine
2016-06-16 05:17:30 +00:00
32caa09adc
Merge pull request #23593 from justincormack/mlock
...
Move mlock back into the default ungated seccomp profile
Upstream-commit: 78d624cfcd29b26aaf25e9e929f54f24ce364341
Component: engine
2016-06-16 05:16:57 +00:00
99862c3f0b
Merge pull request #23603 from mlaventure/revert-runc-to-mainstream
...
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
Upstream-commit: 9cdb6357e2f8c7561ba580c1e16de81d24e1de99
Component: engine
2016-06-16 05:08:44 +00:00
b8b934f883
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 >
Upstream-commit: b86cb293ecc67e76ec90ec60766f52dad6903eac
Component: engine
2016-06-15 21:53:23 -07:00
c6395cdf74
Merge pull request #23577 from anusha-ragunathan/strings_conversion
...
Avoid back and forth conversion between strings and bytes.
Upstream-commit: c18e036d36be09f5144ac99266a2b525cb79ce78
Component: engine
2016-06-15 21:41:04 -07:00
fc28f1b8ca
Merge pull request #23601 from dnephin/change_header
...
Change SCALE to REPLICAS.
Upstream-commit: 8ab79f1f7035288743882a6f0fa8bacc6c8454fa
Component: engine
2016-06-16 04:18:49 +00:00
8e989e5251
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 >
Upstream-commit: f22d0174f33e084445c5845c95aca346e187fb02
Component: engine
2016-06-15 21:13:04 -07:00
9f6da823f0
Merge pull request #23558 from mlaventure/fix-arm-test-for-multiple-runtimes
...
Fix TestRunWithRuntime* on arm
Upstream-commit: 17bf13b1b2b44e0351218fd0b25d716687f0df32
Component: engine
2016-06-16 04:09:15 +00:00
1063457ce1
Merge pull request #23602 from crosbymichael/bump-libnetwork
...
Update libnetwork to 96d45528599c32354230480a1ebc0
Upstream-commit: 18a20c859f6fc9ad5aa51a0e281223b861aa8f62
Component: engine
2016-06-15 19:01:29 -07:00
0c8ccf3ca9
Merge pull request #23604 from londoncalling/getstarted-tutorial-updates
...
fixing links, images and missing files in Getting Started tutorial
Upstream-commit: 1ba9e3cba4a27e67bd233668d9cb05b000ad2571
Component: engine
2016-06-16 11:50:28 +10:00
cb9a8acf9f
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 >
Upstream-commit: 1d80f8ca193139755de935fa6567a32734038cac
Component: engine
2016-06-15 18:37:50 -07:00
dd45c05df9
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.
Upstream-commit: 0c78a7dd64c4c0b11aae040fadbecee2a7fdf5ae
Component: engine
2016-06-16 02:43:13 +02:00
b58041b07a
use same hash for same secret
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: a579ce8ed307024ededd527819bfdbf38e970fbf
Component: engine
2016-06-15 17:20:18 -07:00
66f02f955c
Windows: Added support for memory limit
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 12fe27a40893d92489996550ddff976eba50332c
Component: engine
2016-06-15 17:07:29 -07:00
9bd6973edb
fix docker swarm init/update --secret
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 085895342c7f797f0eef7ec956438e33489f211f
Component: engine
2016-06-15 17:05:10 -07:00
d8d03043a3
Add basic integration tests for plugins.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: a2d48c9e4e2abadcba582de47891837b0a80b24c
Component: engine
2016-06-15 15:19:19 -07:00
4a8d3f13a7
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: b675124cf5fc96a6c329b5580ef60304089270c6
Component: engine
2016-06-15 15:11:50 -07:00
6a10bc5376
Update libnetwork to 96d45528599c32354230480a1ebc0
...
This fixes an issue with hanging tests due to store.
Fixes #23560
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: e927df7b4b58099113b5086371b1d80ff517f564
Component: engine
2016-06-15 15:07:04 -07:00
93b2574efc
Change SCALE to REPLICAS.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4df03499486a7f62f94bd1fb8e2625b0ef932fe5
Component: engine
2016-06-15 17:57:59 -04:00
eb4a784598
Merge pull request #23565 from SvenDowideit/fix-links-tutorials
...
fix links for #23505
Upstream-commit: eab3a1fa553360d39d30e14e7f23cdc769dc4dc5
Component: engine
2016-06-15 21:24:22 +00:00
6afb0ba9c1
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 >
Upstream-commit: bdf01cf5deee11deb426eb33e1c8433c410084b6
Component: engine
2016-06-15 16:25:27 -04:00
a0153fe543
Merge pull request #23542 from mavenugo/aliases
...
Use service alias and configure service VIP or dns-rr
Upstream-commit: 011774e6f0eb5db13fb084b2b8d4d499a9f0548b
Component: engine
2016-06-15 16:18:50 -04:00
407690e430
Merge pull request #23579 from tonistiigi/fix-ci-hang
...
Fix hanging integration tests
Upstream-commit: 8510adf8c856d6f0871650216a0e1d7e6ece46ee
Component: engine
2016-06-15 14:49:54 -04:00
dbd95f4e51
Add accept-permissions flag for install.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: ec4857da485768db8dadda3511122d136d896dde
Component: engine
2016-06-15 10:58:43 -07:00
abaa81f006
Merge pull request #23538 from anusha-ragunathan/incremental-builds
...
Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
Upstream-commit: 64eb01caf6490b57163e55588bcf295d9645fdae
Component: engine
2016-06-15 10:53:31 -07:00
25c9453aac
Fix test typo
...
Changes daemn to daemon
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 51c0c6212d66ff940940e0a2c9393cfffafa5ee5
Component: engine
2016-06-15 13:45:25 -04:00
85aba87fc8
Fix hanging integration tests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 22f827ababc1910bc48762d7980913497dbc915d
Component: engine
2016-06-15 10:19:45 -07:00
