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
Kareem Khazem
859262a82a Added dead to docs for docker ps -f status=... 
It is possible to invoke `docker ps -f status=dead`, but the
documentation for docker-ps does not mention `dead` as a valid option.
This commit fixes that.

Signed-off-by: Kareem Khazem <karkhaz@karkhaz.com>
 2016-01-21 16:44:33 -05:00
Jess Frazelle
e287bef453 Merge pull request #19316 from Microsoft/jjh/incontainererror 
Windows: In container build check
 2016-01-21 13:44:19 -08:00
Diogo Mónica
e579f101e7 Merge pull request #486 from endophage/fix_offline 
tokenAuth should also 'succeed' if we get a 401
 2016-01-21 13:36:49 -08:00
Ying Li
e79839b216 Add better error reporting for update tests. 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-01-21 13:23:30 -08:00
Ying Li
dde9531b4a Fix an error where we get a JSON syntax error on server 404 or 50X. 
We were testing to see if the cached metadata was nil, but we actually
set it to an empty data.Signed object, but didn't always set it to nil
if we failed to get local metadata.

Signed-off-by: Ying Li <ying.li@docker.com>
 2016-01-21 13:23:30 -08:00
Ying Li
36684a3290 Use cached timestamp if we get a 404 when updating timestamp. 
We use the cached timestamp for all other errors, so this makes the
error consistent.  The only special metadata is the root.json, where a 404
signifies that the repository doesn't exist.  Also update the message
when a cached timestamp is used.

Signed-off-by: Ying Li <ying.li@docker.com>
 2016-01-21 13:23:16 -08:00
Tibor Vass
3ecba7089b Merge pull request #19552 from aaronlehmann/vendor-distribution-3 
Vendor updated distribution package
 2016-01-21 16:21:59 -05:00
John Howard
4dbd612d47 Windows: In container build check 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-21 13:15:23 -08:00
John Howard
eacd2fd4da Windows: Update dockerfile.windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-21 12:49:03 -08:00
Tibor Vass
0b7e9ef910 Merge pull request #19550 from Microsoft/jjh/testlinksmultiplewithsamename 
Windows: Fix TestLinksMultipleWithSameName
 2016-01-21 15:38:47 -05:00
Tibor Vass
26334b7a7d Merge pull request #19551 from aaronlehmann/fix-retry-on-enospc 
Don't retry downloads when disk is full
 2016-01-21 15:37:50 -05:00
Tibor Vass
d2448a0c20 Merge pull request #19524 from LK4D4/iocopy_writeto 
Use bufio.Reader in io.Copy source for overlay.copyRegular
 2016-01-21 15:37:12 -05:00
Tibor Vass
16faf8f1fc Merge pull request #19518 from dmcgowan/unwrap-url-error-on-retry 
Unwrap URL errors on retry
 2016-01-21 15:36:41 -05:00
David Lawrence
6389c8cf75 tokenAuth should also 'succeed' if we get a 401, which will result in attempting futher authentication later 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2016-01-21 11:44:00 -08:00
Aanand Prasad
da2b6329ae Add test for logs=False 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/main.py
 2016-01-21 19:20:50 +00:00
Alf Lervag
6e73fb38ea Fixes #2448 
Signed-off-by: Alf Lervag <alf.lervag@bouvet.no>

Conflicts:
	compose/cli/main.py
	requirements.txt
 2016-01-21 19:19:37 +00:00
Alexandre Beslic
63f1d757a3 Merge pull request #1657 from vieux/add_spread_tests 
Add more unit tests for spread strategy
 2016-01-21 11:08:16 -08:00
Aanand Prasad
8662ce8e21 Merge pull request #2723 from aanand/fix-run-with-networking 
Fix 'run' behaviour with networks
 2016-01-21 19:07:53 +00:00
Aaron Lehmann
921eae9d6d Vendor updated distribution package 
Another day, another revendor.

This revision of distribution is more tolerant of incorrect Content-Type
headers when fetching manifests.

Fixes #19526

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-21 11:01:14 -08:00
Richard Scothern
c301f8ab27 Merge pull request #1383 from aaronlehmann/default-manifest-type 
If the media type for a manifest is unrecognized, default to schema1
 2016-01-21 10:59:19 -08:00
Richard Scothern
70f4dac7f7 Merge pull request #1376 from aaronlehmann/use-mime-pkg 
Use mime package to parse media type
 2016-01-21 10:58:53 -08:00
Aanand Prasad
730c33b28c Merge pull request #2699 from aanand/update-compose-file-docs 
Update Compose file documentation for version 2
 2016-01-21 18:57:16 +00:00
Alessandro Boch
3b0d36dbc1 Move ErrUnsupportedNetwork* checks to updateNetworkConfig() func 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-21 10:56:01 -08:00
Joffrey F
fec8cc9f80 Update documentation for external param 
Signed-off-by: Joffrey F <joffrey@docker.com>

Conflicts:
	docs/compose-file.md
 2016-01-21 18:51:28 +00:00
Aanand Prasad
59493dd7aa Add links to networks key references 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:51:28 +00:00
Aanand Prasad
2f41f3aa7e Update documentation for links 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:51:28 +00:00
Aanand Prasad
9a3378930f Document depends_on 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:50:44 +00:00
Aanand Prasad
0554c6e6fd Update Compose file documentation for version 2 
- Explain each version in its own section
- Explain how to upgrade from version 1 to 2
- Note which keys are restricted to particular versions
- A few corrections to the docs for version-specific keys

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:50:44 +00:00
Aanand Prasad
f3e55568d1 Fix interactive run with networking 
Make sure we connect the container to all required networks *after*
starting the container and *before* hijacking the terminal.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:42:59 +00:00
Mary Anthony
cab284d6b2 - Pulling driver specs out of configuruation.md 
- Fixing index metadata error
- Entering all the comments
- Updating with the build fixes
- Fix Microsoft link broken
- Fix collocate, colocate, to unambiguous co-locate

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-21 10:12:46 -08:00
Doug Davis
b7a68d0252 Merge pull request #19548 from WeiZhang555/remove-hard-coded 
Remove hard coded 'docker' string from package
 2016-01-21 13:06:22 -05:00
Aanand Prasad
09dbc7b4cb Stop connecting to all networks on container creation 
This relies on an Engine behaviour which is a bug, not an intentional
feature - we have to connect to networks one at a time

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:04:50 +00:00
Aaron Lehmann
4f13ec5551 Don't retry downloads when disk is full 
There was already a check that prevented protocol-level fallback in this
situation, but retries within a specific protocol will still happen.
This makes it take a long time for the pull to finally error out.

This fixes slowness in TestDaemonNoSpaceleftOnDeviceError, which used to
take a long time due to the backoff between retry attempts:

PASS: docker_cli_daemon_test.go:1868: DockerDaemonSuite.TestDaemonNoSpaceleftOnDeviceError	5.882s

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-21 10:01:51 -08:00
Arnaud Porterie
eacc9fc2c3 Merge pull request #19547 from tonistiigi/revert-aufs-hardlinks 
Revert "Copy aufs hardlinks to top layer"
 2016-01-21 09:56:26 -08:00
John Howard
473a32ba8f Windows: Fix TestLinksMultipleWithSameName 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-21 09:52:49 -08:00
Tibor Vass
5f9375cf39 Merge pull request #19349 from jfrazelle/add-link-to-wiki 
add warning if upgrading via script to migrate
 2016-01-21 12:51:25 -05:00
Vincent Demeester
7aef311269 Merge pull request #19541 from albers/completion-events 
Support new events in bash completion
 2016-01-21 18:40:54 +01:00
Richard Scothern
1df70eb1da Merge pull request #1377 from RichardScothern/correct-event-digest 
Ensure the canonical manifest digest and length are sent to notification endpoints.
 2016-01-21 09:34:56 -08:00
Aaron Lehmann
c01fe47231 If the media type for a manifest is unrecognized, default to schema1 
This is needed for compatibility with some third-party registries that
send an inappropriate Content-Type header such as text/html.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-21 09:34:06 -08:00
Aanand Prasad
a14906fd35 Fix 'run' behaviour with networks 
- Test that one-off containers join all networks
- Don't set any aliases

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 17:28:55 +00:00
Tibor Vass
7d19ca7c40 Merge pull request #19423 from jfrazelle/apparmor-no-install 
disable install of docker-engine for 1.10, try to get ready for 1.11
 2016-01-21 12:08:50 -05:00
Aanand Prasad
1e51b7e88b Merge pull request #2722 from aanand/fix-scale-race-condition 
Fix scale race condition
 2016-01-21 17:08:15 +00:00
Aanand Prasad
013c5ea3f9 Merge pull request #2713 from aanand/links-v2 
Support links in v2 files
 2016-01-21 17:08:05 +00:00
Aanand Prasad
7a4fdfd034 Merge pull request #2712 from jzvelc/fix_v2_service_extend 
Fix `extends` when using v2 config format
 2016-01-21 17:06:21 +00:00
Alexander Morozov
3f5e1c69b3 Use pools.Copy instead of io.Copy for overlay.copyRegular 
That function is pretty heavy used on container start. Autoallocating
buffer can be painful.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-01-21 08:53:37 -08:00
Brian Goff
54587d861d Bump plugin API version 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-01-21 11:41:32 -05:00
David Calavera
aed5691644 Merge pull request #19507 from aaronlehmann/certificate-error-message 
Clarify error message when a .cert file is missing a corresponding key
 2016-01-21 08:29:25 -08:00
Vincent Demeester
5e143d5168 Merge pull request #19540 from A33a/A33a-patch-1 
Fixed typo in "/etc/subUid"
 2016-01-21 17:24:29 +01:00
David Calavera
8c0dd9d182 Merge pull request #19522 from aaronlehmann/vendor-distribution-2 
Vendor updated distribution
 2016-01-21 08:15:41 -08:00
Zhang Wei
d44e79a366 Remove hard coded 'docker' string from package 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-01-22 00:14:52 +08:00