couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kla...@apache.org
Subject [1/2] couchdb-docker git commit: 2.0: tweak readme concerning haproxy and flags
Date Sat, 19 Dec 2015 16:37:13 GMT
Repository: couchdb-docker
Updated Branches:
  refs/heads/master 2b046fbec -> 9270c8894


2.0: tweak readme concerning haproxy and flags


Project: http://git-wip-us.apache.org/repos/asf/couchdb-docker/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-docker/commit/34d52bd4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-docker/tree/34d52bd4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-docker/diff/34d52bd4

Branch: refs/heads/master
Commit: 34d52bd4994f193841087732a0a4df300ddc9b9b
Parents: 2b046fb
Author: klaemo <klaemo@fastmail.fm>
Authored: Sat Dec 19 17:14:39 2015 +0100
Committer: klaemo <klaemo@fastmail.fm>
Committed: Sat Dec 19 17:14:39 2015 +0100

----------------------------------------------------------------------
 README.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/34d52bd4/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 55f51b3..4690baa 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Available on the docker registry as [klaemo/couchdb:2.0-dev](https://index.docke
 
 ```bash
 # expose the cluster to the world
-[sudo] docker run -p 5984:5984 klaemo/couchdb:2.0-dev
+[sudo] docker run -it -p 5984:5984 klaemo/couchdb:2.0-dev
 
 [ * ] Setup environment ... ok
 [ * ] Ensure CouchDB is built ... ok
@@ -70,14 +70,16 @@ Admin username: root
 Password: 37l7YDQJ
 Time to hack! ...
 ```
+**Note:** By default the cluster will be exposed on port `5984`, because it uses haproxy
+(passes `--with-haproxy` to `dev/run`) internally.
 
-...or you can pass arguments to the binary
+...but you can pass arguments to the binary
 
 ```bash
-docker run -i -t klaemo/couchdb:2.0-dev --admin=foo:bar
+docker run -it klaemo/couchdb:2.0-dev --admin=foo:bar
 ```
-
-**Note:** The cluster will be exposed on port `5984`, because it internally uses haproxy.
+**Note:** This will overwrite the default `--with-haproxy` flag. So, you have to specify
it
+explicitly if you wish to use haproxy.
 
 ## Build your own
 


Mime
View raw message