1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
909f9f5ea8 Merge pull request #25726 from vieux/new_plugin_system_doc
adding some documentation about the new plugin system
(cherry picked from commit 88a6a7763b789a35fff9df4e52e48ca99afd3c08)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:02:11 -07:00
Sven Dowideit
e98eafcc3c Merge pull request #26168 from sfsmithcha/fix_swarm_tutorial_note
Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
2016-08-31 12:23:09 +10:00
Charles Smith
69d3aaa2e2 Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
fixed line spacing in Swarm tutorial bullets
(cherry picked from commit 62215920871b8d15a6ffe538baac5abe2b715409)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-30 15:12:02 -07:00
Charles Smith
1f563dd224 Merge pull request #26117 from sfsmithcha/2016_08_29_engine_docs_updates
author merge: Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
2016-08-30 11:02:05 -07:00
Charles Smith
5d2e3ad0c9 Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
fixed line spacing in Swarm tutorial bullets
(cherry picked from commit 62215920871b8d15a6ffe538baac5abe2b715409)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-29 12:30:00 -07:00
Charles Smith
f1bcb5f10e Merge pull request #26064 from sfsmithcha/updates_to_v1.12.1_docs
author merge: Updates to v1.12.1 docs
2016-08-29 10:02:01 -07:00
Sebastiaan van Stijn
080891bb11 Merge pull request #25902 from MihaiB/docs-link-fragment
docs: fix typo in url fragment
(cherry picked from commit ab533a98dceecec707414006544411cfd18b2d30)
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 16:08:02 -07:00
Sven Dowideit
be94e07b6d Merge pull request #25901 from yuexiao-wang/add-content
Add the content for how services work
(cherry picked from commit abd08f4784810bcf8b4e88e3f9ef1023cb15b8b5)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 16:07:35 -07:00
Vincent Demeester
ca9bb6e445 Merge pull request #25899 from yuexiao-wang/fix-overview
Optimize description for Feature highlights
(cherry picked from commit d2fa978d4d66622a197eb98f9a77fa217e25f449)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 16:06:55 -07:00
Sven Dowideit
7e956837f2 Merge pull request #25835 from decoursin/patch-1
Update apparmor error message
(cherry picked from commit e168f0b4ad4dfc11a4423a6785d80153f0969808)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 16:06:10 -07:00
Vincent Demeester
069aa4e11a Merge pull request #25815 from justincormack/capdoc
Split list of capabilities into those added by default and those not
(cherry picked from commit d854c4fcc6255330693eee67b655606e92b11544)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 16:05:32 -07:00
Sebastiaan van Stijn
e097320c92 Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave
Specify woker node for docker swarm leave command
(cherry picked from commit 90308fd78315412c30da90217ee14515de4fbf8a)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 16:04:20 -07:00
Charles Smith
fdb5140893 Merge pull request #25781 from sfsmithcha/add_ingress_guide
author merge: add ingress / publish port guide
(cherry picked from commit dee30443368b9ed8046733242410b8c32550ce0d)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 16:03:47 -07:00
Vincent Demeester
63fb3077cc Merge pull request #25775 from ddgenome/entrypoint-env
Remove erroneous ENTRYPOINT note
(cherry picked from commit c1bdda0be8616f987245cb61a4aedc09c8b5c806)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 16:03:07 -07:00
Vincent Demeester
3d4813ffd2 Merge pull request #25751 from yuexiao-wang/clean-docs
Remove mess words in installation doc
(cherry picked from commit bbd5396955a8c36b9f208d64fe580b769c1686f5)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 16:01:14 -07:00
Arnaud Porterie
330486c45f Merge pull request #25750 from talex5/spec
Document Healthcheck in image spec
(cherry picked from commit 46cb1f2601afc2eb99cc31ced362d874c8c3c192)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 15:47:08 -07:00
Sebastiaan van Stijn
dc49ed96cb Merge pull request #25743 from lixiaobing10051267/masterInspect
Check the return message of docker service inspect
(cherry picked from commit 6fa69d2d0610320cce61517eca6e4471f5381561)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 15:44:58 -07:00
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
cyli
0cb33580b2 Update the architecture docs to reflect the notary and jobrunner containers and volumes.
Also update the general configuration to indicate that DTR comes with Notary now.

Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-08-19 15:40:09 -07: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