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
Richard Scothern
f5823ff0be Print the correct token expiration time 
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
 2016-02-03 10:42:32 -08:00
Mary Anthony
f93d787e3b WIP: TLS Docs for Swarm 
Struct edit pass thru conceptual material
Updating with comments from Mike
Tweaking menu layout
Updating for Nigel
Updating with local images, formatting fixes
Updating with the comments from review

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-03 10:37:54 -08:00
Jessica Frazelle
1cbd772629 fix opensuse rpm 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-03 10:34:17 -08:00
Arnaud Porterie
8ee7ad2209 Enable cross-platforms logout from Registry 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2016-02-03 10:32:22 -08:00
Olivier Gambier
c149d45cc8 Merge pull request #1415 from omercnet/patch-1 
Update configuration.md
 2016-02-03 10:31:23 -08:00
Florian Maier
f0df677913 Fix formatting in breaking changes doc 
Signed-off-by: Florian Maier <contact@marsmenschen.com>
 2016-02-03 19:22:14 +01:00
Dimitar Bonev
64336615cf Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-02-03 18:21:44 +00:00
Mary Anthony
a59982eb11 Fixing duplicate identifiers 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
46f33f12b0 Update merge docs with depends_on, and correction about how links and volumes_from are merged. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
dc718eae65 Make links unique-by-alias when merging 
Factor out MergeDict from merge_service_dicts to reduce complexity below limit.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
aa5ff05463 Fix merging of lists with multiple files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Ryan Taylor Long
3b7471ae84 Add depends_on to ALLOWED_KEYS 
This ensures and already existing `depends_on` is not deleted when the service on which it is defined also employs `extends`.

Signed-off-by: Ryan Taylor Long <ryan@rtlong.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
7f009aeeb9 Move command reference to overview. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
44c7d080bd Rename the old environment variable page to link environment variables. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
32bd760526 Cleanup command-line reference docs by renaming overview to envvars. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
009dbbe971 Use the same capitalization for all menu items in the docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
6b59ba0c31 Re-order compose docs so that quickstart guides come before other documentation. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
61d00ebee4 Extract volume init and removal from project. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
3b1276bd44 Include networks in the config_hash. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
3e8a4a5dc3 Don't initialize networks that aren't used by any services. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
0c87e0b18f Refactor project network initlization. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Aanand Prasad
8024f2f09e Tweak and test warning shown when version is a dict 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:43 +00:00
Aanand Prasad
f081376067 Improve error messages for invalid versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
ce0d469c18 Make 'version' a string 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
b2ee08f439 Remove redundant check - self.config should never be None 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
e9ba06ed4b Normalise/fix config field designators in validation messages 
- Instead of "Service 'web' configuration key 'image'", just say
  "web.image"

- Fix the "Service 'services'" bug in the v2 file format

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
9e9b36460c Convert validation error tests to pytest style 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Ying Li
c495410402 Add the github.com/docker/go-connections/tlsconfig dependency to godeps 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-02-03 10:00:29 -08:00
Aaron Lehmann
cbda80aaff Revert "Set idle timeouts for HTTP reads and writes in communications with the registry" 
This reverts commit 84b2162c1a.

The intent of this commit was to set an idle timeout on a HTTP
connection. If a read took more than 60 seconds to complete, or a write
took more than 60 seconds to complete, the connection would be
considered dead.

This doesn't work properly, because the HTTP internals apparently read
from the connection concurrently while writing. An upload that doesn't
complete in 60 seconds leads to a timeout.

Fixes #19967

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-02-03 09:59:56 -08:00
Phil Estes
b2c162a0b3 Merge pull request #19966 from twistlock/user_namespace__unnecessary_text_in_error 
user namespaces: duplicate dot in user namespaces error message
 2016-02-03 12:51:51 -05:00
Nathan LeClaire
7bb4f44fcb Merge pull request #2984 from dgageot/2982-fix-auto-detection 
FIX #2982 Fix shell auto detection
 2016-02-03 09:42:46 -08:00
Nathan LeClaire
7f6d67c030 Merge pull request #2981 from exoscale/fix/exoscale-endpoint 
drivers/exoscale: fix configuration of exoscale endpoint
 2016-02-03 09:42:35 -08:00
David Gageot
834b9b4161 FIX #2982 Fix auto detection 
Signed-off-by: David Gageot <david@gageot.net>
 2016-02-03 08:23:12 -08:00
Phil Estes
e3f96b093a Merge pull request #19964 from vdemeester/factor-prefix-and-slash-platform 
Add a getPrefixAndSlashFromDaemonPlatform …
 2016-02-03 11:16:29 -05:00
Omer Cohen
5438838be4 fix yml indent 
Signed-off-by: Omer Cohen <git@omer.io>
 2016-02-03 17:59:49 +02:00
Vincent Demeester
98c4f0bbc3 Merge pull request #18966 from mariusGundersen/machine-readable-state 
Expose the machine readable state of a container when listing containers
 2016-02-03 16:41:45 +01:00
Vincent Bernat
7a56ddb054 drivers/exoscale: fix configuration of exoscale endpoint 
The environment variable was `EXOSCALE_ENDPOINT` but the flag was
`--exoscale-url`. When configuring from flags, the wrong name was
used. Therefore, a user was unable to use an alternate endpoint.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2016-02-03 16:25:28 +01:00
Liron Levin
858f852da4 user namespaces: duplicate dot in user namespaces error message 
duplicate dot in user namespaces error message:

$ docker run -ti --net=host ubuntu /bin/bash
docker: Error response from daemon: Cannot share the host or a
container's network namespace when user namespaces are enabled..

Signed-off-by: Liron Levin <liron@twistlock.com>
 2016-02-03 16:56:34 +02:00
Vincent Demeester
382c96ee7b Add a getPrefixAndSlashFromDaemonPlatform … 
… to limit code duplication in integration tests :P

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-02-03 15:16:00 +01:00
Vincent Demeester
bc08203314 Merge pull request #19948 from Microsoft/jjh/testclirm 
Windows CI: Port docker_cli_rm_test.go
 2016-02-03 15:05:21 +01:00
Felix Geisendörfer
9afdd436cd docs: point out known issue with nginx/vboxfs 
see https://github.com/docker/docker/issues/18666

Signed-off-by: Felix Geisendörfer <felix@debuggable.com>
 2016-02-03 15:02:48 +01:00
Mary Anthony
c1b5c9c49c Adding get-swarm and fix for #1580 
Fixing duplicate PR
Updating get-swarm
Removing the fix for fix for #1580
Update with MB comments
Fixing note

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-03 06:01:01 -08:00
Omer Cohen
d842645de9 Update configuration.md 
fixed broken links

Signed-off-by: Omer Cohen <git@omer.io>
 2016-02-03 15:57:55 +02:00
Sebastiaan van Stijn
f37e10aee3 Merge pull request #19961 from coolljt0725/check_nil 
1.10.0-rc3: Check nil before set resource.OomKillDisable
 2016-02-03 14:52:18 +01:00
Zhang Wei
2c63ac3a97 Fix error message for pause a restarting container 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-02-03 21:20:27 +08:00
Sebastiaan van Stijn
0736dba624 Merge pull request #19947 from Microsoft/jjh/testclistart 
Windows CI: Port docker_cli_start_test.go
 2016-02-03 13:40:55 +01:00
Qiang Huang
d8d47f428d Sync with Dockerfile 
Add support for seccomp and buildpack-deps, and
updated some commit numbers.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-02-03 12:09:52 +00:00
Sebastiaan van Stijn
b75d0929b1 Merge pull request #19914 from coolljt0725/fix_top_restart 
Fix docker top a restarting container
 2016-02-03 11:28:10 +01:00
Lei Jitang
09a33b5f60 Check nil before set resource.OomKillDisable 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-02-03 04:31:00 -05:00
Vincent Demeester
4ef06e9ef1 Merge pull request #19946 from Microsoft/jjh/stats 
Windows: Turn off stats
 2016-02-03 09:28:25 +01:00