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

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
631f5be02f Merge pull request #1481 from albers/completion-smart-recreate 
Support --x-smart-recreate in bash completion
(cherry picked from commit 9a0bb325f2)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 14:39:52 -04:00
Ben Firshman
4f4ea2a402 Merge pull request #1325 from sdurrheimer/master 
Zsh completion for docker-compose
(cherry picked from commit b638728d6c)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	docs/completion.md
 2015-06-09 14:39:50 -04:00
Aanand Prasad
5a5bffebd1 Merge pull request #1464 from twhiteman/bug1461 
Possible division by zero error when pulling an image - fixes #1463
(cherry picked from commit d0e87929a1)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 14:39:05 -04:00
David Calavera
18ddc2728d Merge pull request #13805 from aboch/czo 
Add integ test for unpublished ports in ps o/p
 2015-06-09 11:30:06 -07:00
Alexander Morozov
06aef2b5c2 Merge pull request #13819 from Mashimiao/optimize-logic-of-get-container 
daemon: cleanup getting container logic
 2015-06-09 10:42:24 -07:00
David Calavera
30448166de Fix volume plugin serialization. 
Unmarshal errors into strings.
Fix `omit` typos.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-09 10:39:46 -07:00
Hu Keping
5d5caa0e9a Test: add test for HTTPChecker 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-06-10 01:39:34 +08:00
Evan Hazlett
d8418d01d2 Merge pull request #1338 from amylindburg/master 
Update ROADMAP.md
 2015-06-09 13:32:19 -04:00
Evan Hazlett
823020837c Merge pull request #1119 from huslage/ca-more-capabilities 
Generate more generic certificates that can have other uses.
 2015-06-09 13:20:14 -04:00
Evan Hazlett
7bd70db83b windows: error message if using powershell/cmd and none specified 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 13:18:15 -04:00
Aanand Prasad
ff151c8ea0 Test that data volumes now survive a crash when recreating 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 13:06:09 -04:00
moxiegirl
ee8ec4b7aa Merge pull request #1314 from moxiegirl/tweak-1288 
Tweaking the language to the 1288 work.  Thanks everyone.
 2015-06-09 09:53:15 -07:00
Alessandro Boch
7b9ae696d8 Add integ test for unpublished ports in ps o/p 
- This is a test to assert the fix #13734

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-06-09 09:40:19 -07:00
Nathan LeClaire
3387f988b8 Merge pull request #1292 from ehazlett/vbox-recreate-hostonlyif 
virtualbox: more flexibility with networking
 2015-06-09 09:35:08 -07:00
Sebastiaan van Stijn
90259fed2e Merge pull request #12031 from jlhawn/build_cache_ignore_mtime 
Make build cache ignore mtime
 2015-06-09 18:26:07 +02:00
Aanand Prasad
66af37b135 Merge pull request #1474 from aanand/fix-ssl 
Fix SSL "CERTIFICATE_VERIFY_FAILED" error
 2015-06-09 11:56:27 -04:00
Evan Hazlett
2f4d8c4237 vbox: refactor random IP allocation to func 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 11:05:29 -04:00
Evan Hazlett
ca5f0738e2 vbox: allow specifying host only adapter cidr 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 11:05:29 -04:00
Evan Hazlett
3304bf8923 virtualbox: check for hostonly iface and add if needed on start 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 11:05:29 -04:00
James Turnbull
3b01dac44d Merge pull request #13814 from duglin/DocTweak 
Fix COPY/ADD quoted/json form
 2015-06-09 04:56:35 -04:00
Ma Shimiao
73bc885b23 daemon: cleanup getting container logic 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-06-09 14:47:07 +08:00
Matt Robenolt
b684b77a0c Return valid json from StatusHandler 
Signed-off-by: Matt Robenolt <matt@ydekproductions.com>
 2015-06-08 23:31:03 -07:00
Jörg Thalheim
2b4facdf2e hack: explicit bundles for integration-cli prequisites 
no longer load hide critical code such as in .integration-daemon-{start,stop},
if this step failed, it will had logged the corresponding module before:

---> Making bundle: .integration-daemon-start (in bundles/1.7.0-dev/daemon-start)

which is nicer to debug.

This will make it also easier to execute a single tests in an interactive shell.

$ make shell
docker> . hack/make.sh binary .integration-daemon-start .integration-daemon-setup
docker> docker ps
CONTAINER ID        IMAGE               COMMAND             CREATED STATUS              PORTS               NAMES
docker> go test github.com/docker/docker/integration-cli

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-06-09 07:22:26 +02:00
Alexander Morozov
7f6aa3b783 Merge pull request #13816 from xiekeyang/remove 
Registry: remove unwanted return variable name
 2015-06-08 20:38:30 -07:00
xiekeyang
a31be25121 Registry: remove unwanted return variable name 
Signed-off-by: xiekeyang <xiekeyang@huawei.com>
 2015-06-09 10:58:33 +08:00
Jeffrey Morgan
a3ca2217e1 Adding gruntfile for better compatibility with electron community 2015-06-08 19:36:59 -07:00
Stephen Day
f63313de1f Merge pull request #599 from stevvooe/clarify-deletion-by-digest-constraint 
Clarify digest in API specification
 2015-06-08 19:04:53 -07:00
Stephen J Day
7e6b4e8c52 Add description of digests to API specification 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-06-08 19:04:13 -07:00
Sean Li
ea5f7dba8c Fixed sizing for homepage grid. 2015-06-08 18:18:50 -07:00
Jessie Frazelle
5e0e71bbe0 Merge pull request #13714 from flavio/add-suse-support-to-docker-installer 
Added openSUSE and SUSE Linux Enterprise support to install.sh
 2015-06-08 17:20:33 -07:00
Tibor Vass
123a0582b2 Do not set auth headers if 302 
This patch ensures no auth headers are set for v1 registries if there
was a 302 redirect.

This also ensures v2 does not use authTransport.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-06-08 19:59:39 -04:00
Doug Davis
f4a3e8bef0 Fix COPY/ADD quoted/json form 
Minor tweak to the quoted/json form and made man page look like the Dockerfile
docs.  W/o the `,` people may think there should be a space delimited list.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-06-08 16:40:20 -07:00
Andrea Luzzardi
2999809358 Merge pull request #914 from vieux/improve_test/integration/resource_management.bats2 
tweak tests in resource_management.bats
 2015-06-08 16:22:35 -07:00
David Lawrence
99997dc8b3 adding basic roadmap 2015-06-08 16:10:57 -07:00
Victor Vieux
a355d3c55e tweak tests in resource_management.bats 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-08 16:07:33 -07:00
Olivier Gambier
25bd3fc777 Link to compose 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:57:06 -07:00
Olivier Gambier
b8d785c79e Use bcrypt 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:57:06 -07:00
Olivier Gambier
81e8657d7b Fix here doc conf generation 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:57:05 -07:00
Olivier Gambier
8c1784c838 Keeping in synch 
- commenting out both the "JSON" and "token" specs, unless someone thinks they should be here
- added help, glossary, introduction and authentication documents

Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:57:05 -07:00
Olivier Gambier
96d79eb30e Adding authentication 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:57:05 -07:00
Olivier Gambier
74873aed14 Removing internal information 
Removed content has been ported to the wiki

Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:57:05 -07:00
Olivier Gambier
c1c638d01f Minor keyword add 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:55:52 -07:00
Olivier Gambier
c405f3717a Minor fixes 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:55:52 -07:00
Olivier Gambier
56ff32c683 Revising glossary 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:55:52 -07:00
Olivier Gambier
10ba376a99 Minor cleanup in the index 
- adding glossary
- removing empty "advanced"
- commenting out building and architecture for now
- minor text enhancements

Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:55:51 -07:00
Olivier Gambier
c3b3802503 Small fixes 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:55:51 -07:00
Olivier Gambier
b7b8e64f1d Moved instructions up 
Make it more obvious that environment variables is the way to go.

Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:55:51 -07:00
Olivier Gambier
26d87ed1a5 No reason to detail here 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:55:51 -07:00
Olivier Gambier
431e829fa5 Simplified index 
Simplified index again, to make access to information more obvious and more direct.
Added a TLDR for people in a hurry.

Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:55:51 -07:00
Olivier Gambier
d9dfe54308 Separated "help" 
Help page is separate now.
Removed the bulk of it from various pages.

Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-08 15:55:51 -07:00