docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sven Dowideit
9eae185fdd Merge pull request #2337 from dangoncalves/issue-2336 
Make install manual less confusing
 2016-08-03 11:38:04 -07:00
Daniel Gonçalves
535ea05d3d Make install manual less confusing 
Signed-off-by: Daniel Gonçalves <daniel.goncalves@polymont.fr>
 2016-08-03 15:43:16 +02:00
xianlubird
2164f0283d Fix scheduler detail log improper effect when container name is empty 
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
 2016-08-02 11:06:49 +08:00
Allen Sun
a5a7ed4526 Merge pull request #2244 from ezrasilvera/mesosCheckNameFix 
Check unique container name on create and rename for Mesos cluster
 2016-08-02 10:17:12 +08:00
Joao Fernandes
3350253c19 Revamp docs for permission management 2016-08-01 16:21:44 -07:00
Nathan LeClaire
7e9c0d922d Merge pull request #543 from docker/test2get 
Change test.docker.com to get.docker.com for final release
 2016-07-28 17:43:46 -07:00
Nathan LeClaire
97117f7144 Change test.docker.com to get.docker.com for final release 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-28 17:43:26 -07:00
Nathan LeClaire
8adfe0ee4e Merge pull request #542 from docker/bump_1.12.0 
Bump versions for 1.12.0
 2016-07-28 17:40:40 -07:00
Nathan LeClaire
4359eee68a Bump versions for 1.12.0 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-28 17:16:38 -07:00
Tibor Vass
8eab29edd8 Bump VERSION to v1.12.0 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-28 14:06:23 -07:00
Tibor Vass
3c292b6d92 Merge pull request #25191 from mavenugo/1.12.dl 
Vendoring libnetwork to 1.12.0-bump branch to avoid a deadlock
 2016-07-28 13:59:20 -07:00
Alexandre Beslic
5d5f7f04c8 Merge pull request #2435 from nishanttotla/bump-1.2.4 
Bump version to 1.2.4
 2016-07-28 12:47:36 -07:00
Nishant Totla
3d4d8be89b Bump version to 1.2.4 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-07-28 12:20:46 -07:00
Madhu Venugopal
4f369a74fa Vendoring libnetwork to avoid a deadlock 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-07-28 12:02:09 -07:00
Tibor Vass
cd22bb863c Merge pull request #25178 from crosbymichael/bump-restore 
Check if the container is running if no event
 2016-07-28 11:13:37 -07:00
Aaron Lehmann
a9b1322edf Document TOOMANYREQUESTS error code 
Add entries with this error code in registry/api/v2/descriptors.go.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-28 10:28:13 -07:00
Michael Crosby
eddee8e932 Check if the container is running if no event 
When there is no event for the container it can happen because of a
crash and the container state on the persistent disk will have a
mismatch between what was in `/run` ( machine crash ).

This situation will create an unkillable container in docker because
containerd does not see it and it is not running but docker thinks it is
and you cannot tell it anything different.

This fixes the issue by checking if containerd has the container running
if we do not have an event instead of just returning.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-07-28 09:22:51 -07:00
Nishant Totla
0d05ee2354 Merge pull request #2206 from nishanttotla/http-client-create 
Creating http client in swarm
 2016-07-28 01:14:19 -07:00
Sven Dowideit
ad9eac89e9 Merge pull request #541 from londoncalling/docs-v112a 
added info about d4mac and d4win for v1.12 publish set
 2016-07-28 13:33:13 +10:00
Victoria Bialas
27bffccbb2 added info about d4mac and d4win for v1.12 publish set 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-07-27 19:04:06 -07:00
Aanand Prasad
3672996bac Merge pull request #3669 from chrisclark/master 
Docs: Typo leading to possible extreme agony
(cherry picked from commit edd3637b9b0e80d2ed1d3dc5f1f74f351f9116cc)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-07-28 11:28:52 +10:00
Sven Dowideit
ae97955f99 Merge pull request #3631 from jamesottaway/patch-1 
Document `tmpfs` being v2 only
(cherry picked from commit 5c1abe2e293ffdfaee3f2a07499ef765adfbd10e)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-07-28 11:28:43 +10:00
Ben Firshman
aa044719c0 Merge pull request #3570 from davidjb/patch-1 
Fix minor YAML typo
(cherry picked from commit da2aae2a298d035ebfd81e89a02fe51d0ef4839f)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-07-28 11:28:37 +10:00
Justin Cormack
664fcd9f28 Merge pull request #25142 from tiborvass/1.12.0-final-cherry-picks 
1.12.0 final cherry picks
 2016-07-28 00:21:36 +01:00
Tibor Vass
f399272f7b Merge pull request #25149 from tiborvass/1.12-changelog-fix 
Add some ommissions to CHANGELOG and update some swarm commands
 2016-07-27 15:28:46 -07:00
Madhu Venugopal
29f6886e48 Vendoring libnetwork to fix #25109 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit b1ae883d3f8c35f9142966af7bf5278e7a10b268)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:55:30 -07:00
Charles Smith
7f6a1d9fb7 update rolling update tutorial to reflect default parallelism and update on failure 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 6440cacd49226e97b2dcb64eb31cb32b87b1ff18)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:55:30 -07:00
Lei Jitang
c46db363d6 Fix daemon panic on restoring containers 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit c75de8e33cc0db5236eef6146f2de06533b46aa8)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:51:42 -07:00
John Howard
cda10d4d7f Move directive out of globals 
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 755be795b4e48b3eadcdf1427bf9731b0e97bed1)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:51:42 -07:00
Derek McGowan
3fba11f7c6 Fix files in subdirectories creating bad whiteout 
Closes #23863

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit 1c0f6653ba82c933885719478e90c13f8d7e32b7)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:51:42 -07:00
Derek McGowan
b49dd20939 Update diff apply test to check sub directories 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit 5c05b8447d06793530e3d860b99a6e878685275a)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:51:42 -07:00
Michael Crosby
0a4abdb0ac Remove the Require on the socket for the rpm 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 3cddda3bbb0cbc6f600b228b61e1110e0cf34c65)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:51:42 -07:00
Brian Goff
d79bd3010a Fix issue with test ordering for TestParseWords 
`TestParseWords` needs to use the `tokenEscape` for one of the test
cases, but `tokenEscape` was not being set unless tests ran in a
specific order.
This sets a default value for `tokenEscape`... `\`... so that tests that
rely on this global are not affected by test ordering.

This is the simplest fix for these cases. Ideally the token should not
be set as a global but rather passed down, which is a much larger
change.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit df167d3ff04cdc90012c8ca39647662ad69e6715)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:51:42 -07:00
Harald Albers
486d5aa47f Remove bash completion for docker swarm inspect 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 34d9a8240914d30f3a8fe28c1b7d1d4e36d0657b)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:51:41 -07:00
Harald Albers
55b920c988 bash completion for container labels to service {create,update} 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 13c138ec2a896a87da8fa81693975e7ffbec85fd)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:51:41 -07:00
Tibor Vass
05073a911d Add some ommissions to CHANGELOG and update some swarm commands 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:46:01 -07:00
Tibor Vass
1f33c33fbe Merge pull request #25145 from aaronlehmann/remove-join-tokens-from-info 
Carry #25134: Remove join-tokens from the /info API
 2016-07-27 14:39:38 -07:00
Tibor Vass
7b7b9078cf Merge pull request #25140 from stevvooe/service-ps-over-tasks-bump_v1.12.0 
[bump-1.12.0] cli: `docker service|node|stack ps` instead of tasks
 2016-07-27 14:38:08 -07:00
Tibor Vass
c9b38547d5 Merge pull request #25144 from dnephin/remove-extraneous-aliases.bump 
[bump_v1.12.0] Remove extraneous mount aliases
 2016-07-27 14:13:49 -07:00
French Ben
02c9f96071 Kitematic version to match engine 
Signed-off-by: French Ben <frenchben@docker.com>
 2016-07-27 13:51:41 -07:00
Nathan LeClaire
b85aac1546 Bump version to 0.8.0 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-27 13:49:03 -07:00
Nathan LeClaire
c616791108 Merge pull request #3616 from nathanleclaire/revert_version_bump 
Revert "Bump version for 0.8.0"
 2016-07-27 13:41:31 -07:00
Nathan LeClaire
fd85914f80 Revert "Bump version for 0.8.0" 
This reverts commit 324f31ea4b.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-27 13:38:59 -07:00
Nathan LeClaire
9a2e327224 Merge pull request #3614 from nathanleclaire/v0.8.0_bump 
Bump version for 0.8.0
 2016-07-27 13:31:45 -07:00
Nathan LeClaire
324f31ea4b Bump version for 0.8.0 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-27 13:21:30 -07:00
Nathan LeClaire
fcad7821d7 Merge pull request #3612 from GenPage/patch-1 
Update digitalocean driver image defaults
 2016-07-27 13:16:28 -07:00
Tibor Vass
340ff060a8 Merge pull request #25103 from tiborvass/fix-bad-cherry-pick-info 
Fix bad cherrypick from a91bc28e62
 2016-07-27 12:45:31 -07:00
Joffrey F
94f7016fb7 Merge pull request #3777 from docker/bump-1.8.0 
Bump 1.8.0
 2016-07-27 12:40:07 -07:00
Aaron Lehmann
d8f3b3f006 Remove join-tokens from the /info API 
join-tokens are not needed for this endpoint, and should not be as part
of /info

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-27 12:10:49 -07:00
Daniel Nephin
398bde913f Remove extraneous mount aliases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-27 15:07:20 -04:00