Commit Graph

42285 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 21e168053f Merge pull request #25709 from thaJeztah/fix-missing-docs-for-binary-remote-context
Add missing docs about binary remote contexts
(cherry picked from commit b4abe38d43f1158b3c085ef006e88740296a3020)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 15:44:11 -07:00
Sebastiaan van Stijn 88bd4cb0ea Merge pull request #25704 from thaJeztah/cleanup-api-markdown
Cleanup API docs Markdown formatting and wording
(cherry picked from commit 45cb33e65ca5bb247e2e9f425b4441ad6a08aa51)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 15:41:54 -07:00
Sven Dowideit d252e6ac51 Merge pull request #557 from SvenDowideit/add-jenkinsfile
Add docs checking Jenkinsfile
2016-08-24 14:57:40 +10:00
Sven Dowideit 677967c4f1 Add docs checking Jenkinsfile
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-08-22 12:25:51 +10:00
Nathan LeClaire db24b21660 Merge pull request #555 from docker/1.12.1
Bump to 1.12.1
2016-08-18 16:57:03 -07:00
Nathan LeClaire 768f358596 Bump to 1.12.1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-18 16:58:13 -07:00
Nathan LeClaire 41b3b25335 Bump version to 0.8.1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-18 16:29:40 -07:00
Nathan LeClaire 81424e7b52 Move generated systemd unit file closer to upstream
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-18 16:11:54 -07:00
Ahmet Alp Balkan f212b53d43 azure: update docs with updated default param
Update `--azure-image` param documented that changed in

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-08-18 16:11:47 -07:00
Ahmet Alp Balkan 3fe6f7f33c azure: increase log level for info statement
This should have been info in the first place.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-08-18 16:11:40 -07:00
Ahmet Alp Balkan f63aaa20dd azure: bump default image to Ubuntu 16.04.0-LTS
Ubuntu 15.10 image is EOL'd and removed from azure.
Closes #3676.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-08-18 16:11:30 -07:00
Dongluo Chen 27968edd8a Merge pull request #2454 from dongluochen/bump-v1.2.5
Bump version to 1.2.5
2016-08-18 16:05:59 -07:00
Dong Chen 04114bb5b5 Bump version to 1.2.5
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-08-18 16:03:39 -07:00
Dongluo Chen dcaaa5570a Merge pull request #2436 from dongluochen/rescheduleWithOverlay
Reschedule containers with global network
2016-08-18 14:41:03 -07:00
Charles Smith 25919db69e Merge pull request #2453 from RangerMauve/patch-3
Fix name of private key in configure-tls guide
2016-08-18 14:09:32 -07:00
Nathan LeClaire c1cd1162f9 Merge pull request #552 from bbodenmiller/patch-2
set no proxy flag - exclude machine from proxy
2016-08-18 11:25:29 -07:00
RangerMauve c5d5e7341b Fix name of private key in configure-tls guide
Fixes https://github.com/docker/docker/issues/25823

Signed-off-by: Georgiy Shibaev <RangerMauve@hotmail.com>
2016-08-18 10:04:51 -04:00
Ben Bodenmiller 58b7007970 set no proxy flag - exclude machine from proxy
Signed-off-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
2016-08-18 00:09:44 -07:00
Tibor Vass 23cf638307 Bump VERSION to v1.12.1
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-17 21:40:58 -07:00
Tibor Vass 3e4c33365f Merge pull request #25830 from tiborvass/cherry-pick-25825
[1.12] Fix volume not working after daemon restart
2016-08-17 21:05:32 -07:00
Dongluo Chen 93fec7608c Merge pull request #2442 from dongluochen/install-w-machine
Revert install-w-machine.md to 833471b74c.
2016-08-17 20:37:13 -07:00
Brian Goff e8ed523480 Fix volume not working after daemon restart
When the daemon is started, it looks at all the volumes and checks to
see if any of them have mount options persisted to disk, and loads them
from disk if it does.

In some cases a volume will be created with an empty map causing the
options file to be persisted and volume options set to a non-nil value
on daemon restart... this causes problems later when the driver checks
for a non-nil value to determine if it should try and mount with the
persisted volume options.

Ensures 2 things:

1. Instead of only checking nilness for the opts map, use `len` to make
sure it is not an empty map, which we don't really need to persit.

2. An empty (or nulled) opts.json will not inadvertnatly set volume
options on daemon restart.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 246d1eb58e807f2cf2d2b387e267dcfa228f96a8)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-17 20:17:09 -07:00
Tibor Vass 5d29b79241 Merge pull request #25780 from thaJeztah/1.12.1-docs-cherry-picks
1.12.1 docs cherry picks
2016-08-17 20:01:46 -07:00
Tibor Vass 6e7b8f41ca Merge pull request #25787 from tiborvass/cherry-pick-23790
[1.12] Skip always pulling images on integration tests
2016-08-17 20:00:56 -07:00
Tibor Vass bd8d47e028 Merge pull request #25811 from aaronlehmann/swarm-changelog
Add swarm section to 1.12.1 changelog
2016-08-17 17:14:55 -07:00
Nathan LeClaire 6c900e6d66 Merge pull request #553 from bbodenmiller/patch-3
clear all_proxy if not socks address
2016-08-17 17:00:20 -07:00
Nishant Totla 5e2ae22513 Merge pull request #2444 from dongluochen/containerRefresh
Listen to health_status events
2016-08-17 16:20:43 -07:00
Eivin Giske Skaaren c745f4db98 "Annotations" not a parameter
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
(cherry picked from commit 69e481af4e1fec65629c6ea4eb74fc58f5abc932)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:22:00 +02:00
Eivin Giske Skaaren b313230fa8 Capital D in "ID" returned when creating service
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
(cherry picked from commit 9eb2ec799eb37210dee5183ace375e480bbfd8aa)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:22:00 +02:00
Eivin Giske Skaaren a193f2995e Add doc for inspect swarm
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
(cherry picked from commit c59bc537274aa7f4dc9702ea08c349c71a024b39)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:22:00 +02:00
Sebastiaan van Stijn 0f63ddb03d Fix capitalization
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 75e60fbe09f6065ed095671f98713d862c466858)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:22:00 +02:00
Sebastiaan van Stijn 2875711fe7 Restore missing ps example for killed containers
This example was added in b0b2f979c7,
but got lost during splitting up the cli.md docs into separate files;
561bfb268d

This restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8d5818a6931db9d0acd4a6663815cd317da1bb6b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Sebastiaan van Stijn e24421a6ef Move sysctls to correct API version
Commit 067b510dfc move the
sysctls feature to the right API version, but
missed this one.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7cdd693d5d2094f73383145eb74d81c6b9bb9b24)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Sebastiaan van Stijn e2c8597c8f Add X-Registry-Auth header to service API docs
The service create/update endpoints support
passing registry-authentication information,
but this was not documented.

This adds the missing information about passing
a X-Registry-Auth header.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit bde35ef18a408a297b960c439dc029cfb5e15464)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Akihiro Suda f436a41d0c Add a note about the open(2) and rename(2) on AUFS and OverlayFS
Close #25409
Update #10180

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit aab101a770a88cdbde5012dc7eb5b4439cf57192)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
lixiaobing10051267 fc8a0f4786 command "docker service remove" not insistant
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 078e2aa1571ad402f0a9599e6fac2286a3d35f54)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Sven Dowideit 9bc8e7858c James' site has been dead for a while - removing links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit a9b08f3102e946df44337deb65c99b41570754d1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
David Lechner a30a0b07a4 Move export from image commands to container commands
The export command operates on containers, not images, so it should be listed under the container commands, not the image commands.

Signed-off-by: David Lechner <david@lechnology.com>
(cherry picked from commit 43c8cc7bb4dd42bebabf68e509a3596ef7a642cd)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Matt Bentley 05e1e65ca7 Add install of virtual kernel extras for AUFS
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
(cherry picked from commit e715ca506f41b22cde21187328fcb416cec5e6a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Charles Smith 4534b9e6c3 add overlay networking guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit e56dd0e0e7d2eb921390c7aaff091b8b613c4c6b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Charles Smith 3da4ac64af add overlay networking security model node
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit cc5debcb2e8621358721eb860c07f33f8b83d684)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Tonis Tiigi 13e82f23c8 Skip always pulling images on integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit e2226223e614716749cdb7701a130c7449f5f854)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-17 14:19:31 -07:00
Aaron Lehmann 74cdda0333 Add swarm section to 1.12.1 changelog
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-08-17 14:10:42 -07:00
Dong Chen c3b9a533bc Reschedule with overlay network
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-08-17 11:41:08 -07:00
Nathan LeClaire da301e5b7e Merge pull request #551 from bbodenmiller/patch-1
improve proxy variables check
2016-08-17 11:25:59 -07:00
Dong Chen 5243531291 Fix link to discovery.md.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-08-17 10:02:49 -07:00
Ben Bodenmiller 895536880f clear all_proxy if not socks address
Signed-off-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
2016-08-17 00:14:48 -07:00
Ben Bodenmiller 5712450bd0 improve proxy variables check
Signed-off-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
2016-08-17 00:06:06 -07:00
Tibor Vass 236317fa56 Bump VERSION to v1.12.1-rc2
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 21:30:11 -07:00
Tibor Vass f806ae4838 Merge pull request #25767 from tiborvass/1.12.1-rc2-cherrypicks
1.12.1 rc2 cherrypicks
2016-08-16 21:26:03 -07:00