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

47845 Commits

Author SHA1 Message Date
Matthieu Hauglustaine
e848494017 Return bufio error if set in ParseEnvFile
Return an error value if bufio failed to properly read a token.
Avoids running a container with partial environment.

Fixes: #14266

Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com>
2015-07-01 17:17:48 +02:00
Mazz Mosley
098ec3dcaa Add in git fork syncing links
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:11 +01:00
Mazz Mosley
4e0f4aa20a Split out release process
To aid clarity in how to contribute, I've moved the release process
out into it's own RELEASE_PROCESS.md file. The release process info
is only relevant for maintainers who are building new releases of
compose.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:11 +01:00
Mazz Mosley
c45c16cead Improve localhost & boot2docker info
Added a link to boot2docker for those unfamiliar with it.

http://0.0.0.0:5000 didn't resolve for me, however localhost:5000
did, so included reference to that.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:11 +01:00
Mazz Mosley
d0c499329e Add a note not to worry
When reading through the code for the first time and seeing redis,
those unfamiliar with docker first thought might be that they need
to install redis. Adding this sentence helps make it clearer that
this is not needed. Docker will take care of this in services.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
Mazz Mosley
4c31741ac9 Include command completion link
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
Mazz Mosley
a7a0888446 Re-phrasing for clarity
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
Mazz Mosley
4d69a57edd Include flask output
When running `docker-compose up`, an extra line of output, from flask,
is outputted. I've included it so anyone new to docker-compose who
sees this output will know that it's expected and not worry that
something might have gone wrong.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
Mazz Mosley
3906bd067e Remove redundant import
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
Aanand Prasad
63941b8f6c Add Mazz to MAINTAINERS
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-01 15:38:07 +01:00
Aanand Prasad
75600e37ad Merge pull request #1605 from sdurrheimer/zsh-help-completion
Add --help to subcommands in zsh completion
2015-07-01 12:36:25 +01:00
Yuan Sun
2179dd00dd Add the expected error verification for TestRmiBlank.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-07-01 19:34:43 +08:00
Peeyush Gupta
636ec6383b Fixing the table rendering in reference/run.md
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
2015-07-01 16:07:39 +05:30
Vincent Demeester
d4aec5f0a6 Refactor test and add coverage to runconfig
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-01 10:16:36 +02:00
Diogo Monica
1eb972a820 Changed FingerprintCert to return string; renamed kID fingerprint everywhere in notary
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-06-30 21:44:57 -07:00
David Lawrence
7d2e9817bc Merge pull request #23 from docker/filestore-remove-gun
Removed all references of GUN from filestore
2015-06-30 21:43:53 -07:00
Quentin Tayssier
82b444e3fa Fixing Wheezy link
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com>
2015-07-01 13:01:00 +09:00
Diogo Monica
a0e63bcaeb Fixed verification to use exact match and fallback to CA + tests
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-06-30 19:38:52 -07:00
Diogo Monica
cf3d7d4b52 Removed all references of GUN from filestore
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-06-30 19:36:17 -07:00
Stephen Day
c56e28826e Merge pull request #670 from stevvooe/remove-ipc
Remove half-baked Storage Driver IPC support
2015-06-30 19:21:54 -07:00
Stephen Day
457c8d1563 Merge pull request #656 from jpoler/master
Increase timeout of http.Client for Docker Registry V2 client.
2015-06-30 19:07:53 -07:00
Jeffrey Morgan
1acc086089 Update ROADMAP.md 2015-06-30 18:05:01 -07:00
Jeffrey Morgan
56e8cc04b4 Update ROADMAP.md 2015-06-30 18:04:52 -07:00
Mary Anthony
45257e0548 Updating wieght
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-30 18:03:02 -07:00
Mary Anthony
9dfa2ab0ce fixing weight
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-30 17:51:22 -07:00
Alexandre Beslic
b0fe6000b7 revert to using s.heartbeat for store failover
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-30 17:38:51 -07:00
Jon Poler
f09051fe54 Remove timeout for http.Client in registry/client/repository.go.
Timeouts should not be a discrete period of time, because they end
up being arbitrary and may be difficult to gauge correctly against
very large Docker layers. Rather, timeouts should be set at the
transport level using the SetDeadline attribute on a net.Conn
object.

Signed-off-by: Jon Poler <jonathan.poler@apcera.com>
2015-06-30 17:35:24 -07:00
Victor Vieux
8ad04fab7a skip test: docker attach through websocket
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-30 17:25:16 -07:00
Mary Anthony
3f0cdc5de9 Changing title on menu
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-30 17:25:10 -07:00
Victor Vieux
c3eaa00547 disable mesos tests because mesos is incompatible with the next version of docker
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-30 16:53:09 -07:00
Mary Anthony
f908f1eeb1 Switch to install
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-30 16:44:17 -07:00
Andrea Luzzardi
2c35a860f7 Upgrade golang version (1.3 -> 1.4).
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-30 16:34:03 -07:00
Andrea Luzzardi
3243b093aa Merge pull request #1009 from vieux/fix_api_version
fix api/version.bats
2015-06-30 16:26:38 -07:00
Andrea Luzzardi
77849bd45a Merge pull request #1010 from vieux/remove_2_warnings
remove 2 warnings in docker info
2015-06-30 16:26:24 -07:00
Victor Vieux
ca93c2a21a fix api/version.bats
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-30 15:25:40 -07:00
Victor Vieux
126eade4b9 remove 2 warnings in docker info
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-30 15:20:44 -07:00
Andrea Luzzardi
bedf1ec3ff Merge pull request #1008 from abronan/update_libkv_godeps
Update libkv godeps and minor fixes
2015-06-30 15:19:44 -07:00
Alessandro Boch
126b1b2923 Import latest libnetwork
- To bring in interface which retrieves endpoint statistics

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-06-30 14:16:16 -07:00
David Calavera
bb2cd98b28 Merge pull request #14238 from rileytg/fix-graphdb-test-typo
fixed typo in graphdb_test failure message
2015-06-30 14:15:02 -07:00
Alexandre Beslic
56e4dbb480 use const for failover watch time and minor comment fix in tests
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-30 14:04:41 -07:00
Alexandre Beslic
03a7be2919 fix issue with zookeeper and occasional SOH character return
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-30 14:04:05 -07:00
Alexander Morozov
27af9a52a1 Merge pull request #14303 from cpuguy83/fix_nat_import
Nat was moved to pkg/nat
2015-06-30 13:56:11 -07:00
Brian Goff
d9af8551f8 Nat was moved to pkg/nat
Somehow this import was missed

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-30 16:48:17 -04:00
David Calavera
a2621ac6da Merge pull request #14294 from mavenugo/bnone
fixed incorrect assumption on --bridge=none treated as disable network
2015-06-30 13:40:52 -07:00
Alexander Morozov
caa4acc7b1 Merge pull request #14297 from pwaller/move-nat-pkg
Move /nat to /pkg/nat
2015-06-30 13:23:30 -07:00
Madhu Venugopal
c9328c6ccf fixed incorrect assumption on --bridge=none treated as disable network
libnetwork host, none and bridge driver initialization is incorrectly
disabled if the daemon flag --bridge=none. The expected behavior of
setting --bridge as none is to disable the bridge driver alone and let
all other modes to be operational.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-30 13:04:28 -07:00
Sebastiaan van Stijn
a453da2114 Merge pull request #13962 from unclejack/shrink_docs_images
docs: shrink some big images
2015-06-30 21:55:44 +02:00
Brian Goff
2de810df3f Merge pull request #14231 from ankushagarwal/checkValidPort
Validate hostConfig on daemon. Check for invalid port specifications
2015-06-30 15:54:24 -04:00
Arnaud Porterie
2d8dd6b93e Merge pull request #12846 from dave-tucker/network_integration
integration-cli: Add Tests for IPv6 and Fixed CIDR
2015-06-30 12:52:07 -07:00
Brian Goff
f13b40f6e7 Merge pull request #13524 from calavera/plugin_json_spec
Plugins JSON spec.
2015-06-30 15:44:48 -04:00