You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kl...@apache.org on 2015/11/02 18:05:53 UTC
[1/2] couchdb-docker git commit: readme: tweaks
Repository: couchdb-docker
Updated Branches:
refs/heads/master b368315ab -> b5e077cf6
readme: tweaks
Project: http://git-wip-us.apache.org/repos/asf/couchdb-docker/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-docker/commit/ba22dcae
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-docker/tree/ba22dcae
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-docker/diff/ba22dcae
Branch: refs/heads/master
Commit: ba22dcae8756858f6c9cd340b4bde9a38430ad10
Parents: 3154b94
Author: klaemo <kl...@fastmail.fm>
Authored: Mon Nov 2 17:55:29 2015 +0100
Committer: klaemo <kl...@fastmail.fm>
Committed: Mon Nov 2 17:58:13 2015 +0100
----------------------------------------------------------------------
README.md | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/ba22dcae/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index fbdf165..a7dc176 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,16 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
- Version (stable): `CouchDB 1.6.1`, `Erlang 17.3`
- Version (dev): `CouchDB 2.0 developer preview`, `Erlang 18.0`
+## Features
+
+* built on top of the solid and small `debian:jessie` base image
+* exposes CouchDB on port `5984` of the container
+* runs everything as user `couchdb` (security ftw!)
+* docker volumes for data, logs and config
+
## Run (stable)
-Available in the docker index as [klaemo/couchdb](https://index.docker.io/u/klaemo/couchdb/)
+Available as a trusted build on Docker Hub as [klaemo/couchdb](https://hub.docker.com/r/klaemo/couchdb/)
```bash
[sudo] docker pull klaemo/couchdb:latest
@@ -33,16 +40,6 @@ curl http://localhost:5984
curl http://localhost:5984
```
-## Features
-
-* built on top of the solid and small `debian:wheezy` base image
-* exposes CouchDB on port `5984` of the container
-* runs everything as user `couchdb` (security ftw!)
-* docker volumes for data and logs
-
-The previous version of this image used to come with a process manager to keep
-CouchDB running. As of Docker 1.2 you can use the `--restart` flag to accomplish this.
-
## Run (dev)
Available on the docker registry as [klaemo/couchdb:2.0-dev](https://index.docker.io/u/klaemo/couchdb/)
@@ -81,12 +78,12 @@ docker run -i -t klaemo/couchdb:2.0-dev --admin=foo:bar
You can use `klaemo/couchdb` as the base image for your own couchdb instance.
You might want to provide your own version of the following files:
-* `local.ini` for CouchDB
+* `local.ini` for your custom CouchDB config
Example Dockerfile:
```
-FROM klaemo/couchdb
+FROM klaemo/couchdb:latest
COPY local.ini /usr/local/etc/couchdb/
```
[2/2] couchdb-docker git commit: fix readme
Posted by kl...@apache.org.
fix readme
Project: http://git-wip-us.apache.org/repos/asf/couchdb-docker/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-docker/commit/b5e077cf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-docker/tree/b5e077cf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-docker/diff/b5e077cf
Branch: refs/heads/master
Commit: b5e077cf6e517f030448e789369dd38b7497afad
Parents: ba22dca b368315
Author: klaemo <kl...@fastmail.fm>
Authored: Mon Nov 2 18:05:38 2015 +0100
Committer: klaemo <kl...@fastmail.fm>
Committed: Mon Nov 2 18:05:38 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------