Skip to content

Commit

Permalink
Merge branch 'couchdb-171'
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-kobrzak committed Jun 13, 2018
2 parents 678330b + a0171a5 commit f3e097e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM debian:wheezy

MAINTAINER Krzysztof Kobrzak <[email protected]>

ENV COUCHDB_VERSION 1.6.1
ENV COUCHDB_VERSION 1.7.1

COPY scripts /usr/local/bin

Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ but includes the following changes and improvements:

- adds sample CORS configuration to CouchDB,
- runs everything as user `couchdb`,
- uses CouchDB 1.6.1,
- uses CouchDB 1.7.1,
- is based on Debian Wheezy,
- its Docker image is smaller,
- includes an ARMv7 port that can be used on RaspberryPi 2 (`armhf` branch).

## CouchDB version

The `master` branch currently hosts CouchDB 1.6.1.
The `master` branch currently hosts CouchDB 1.7.1.

## Usage

### Build the image

To create the image, execute the following command on the `docker-couchdb` directory:
To create the image, execute the following command:

```
$ docker build -t kobretti/couchdb-cors .
Expand Down Expand Up @@ -106,4 +106,5 @@ $ docker run -d \

## Copyright

Copyright (c) 2014 Ferran Rodenas, 2015 Krzysztof Kobrzak. See [LICENCE](https://github.com/chris-kobrzak/docker-couchdb/blob/master/LICENCE) for details.
Copyright (c) 2014 Ferran Rodenas, 2015-2018 Krzysztof Kobrzak.
See [LICENCE](https://github.com/chris-kobrzak/docker-couchdb/blob/master/LICENCE) for details.

0 comments on commit f3e097e

Please sign in to comment.