You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2017/09/20 07:08:32 UTC

[couchdb-docker] branch master updated (0d4587d -> 7da42e2)

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git.


    from 0d4587d  Make secret configurable via environment (#25)
     new 751e57e  Remove deprecated 2.0.0 image
     new 7da42e2  Update readme for 2.1.0, new Docker Hub location

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml                |   4 +-
 2.0.0/Dockerfile           | 112 ---------------------------------------------
 2.0.0/docker-entrypoint.sh |  57 -----------------------
 2.0.0/local.ini            |   8 ----
 2.0.0/vm.args              |  28 ------------
 README.md                  |  36 +++++++--------
 6 files changed, 20 insertions(+), 225 deletions(-)
 delete mode 100644 2.0.0/Dockerfile
 delete mode 100755 2.0.0/docker-entrypoint.sh
 delete mode 100644 2.0.0/local.ini
 delete mode 100644 2.0.0/vm.args

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].

[couchdb-docker] 02/02: Update readme for 2.1.0, new Docker Hub location

Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git

commit 7da42e2725d8ff9b69b78951281f308d8f3fc8f9
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Tue Sep 19 23:52:14 2017 -0700

    Update readme for 2.1.0, new Docker Hub location
---
 .travis.yml |  4 ++--
 README.md   | 36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad06a7c..a1a3f2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,9 @@ services:
 before_install:
   - docker build -t couchdb:1.6.1 1.6.1
   - docker build -t couchdb:1.6.1-couchperuser 1.6.1-couchperuser
-  - docker build -t couchdb:2.0.0 2.0.0
+  - docker build -t couchdb:2.1.0 2.1.0
 
 script:
   - docker run -d -p 5984:5984 couchdb:1.6.1 && sleep 5 && curl http://localhost:5984
   - docker run -d -p 5985:5984 couchdb:1.6.1-couchperuser && sleep 5 && curl http://localhost:5985
-  - docker run -d -p 5986:5984 couchdb:2.0.0 && sleep 5 && curl http://localhost:5986
+  - docker run -d -p 5986:5984 couchdb:2.1.0 && sleep 5 && curl http://localhost:5986
diff --git a/README.md b/README.md
index 8f3631e..2608a30 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,13 @@ Put the couch in a docker container and ship it anywhere.
 If you're looking for a CouchDB with SSL support you can check out [klaemo/couchdb-ssl](https://index.docker.io/u/klaemo/couchdb-ssl/)
 
 - Version (stable): `CouchDB 1.6.1`, `Erlang 17.3`
-- Version (stable): `CouchDB 2.0.0`, `Erlang 17.3`
+- Version (stable): `CouchDB 2.1.0`, `Erlang 17.3`
 
 ## Available tags
 
-- `1`, `1.6`, `1.6.1`: CouchDB 1.6.1
-- `1-couchperuser`, `1.6-couchperuser`, `1.6.1-couchperuser`: CouchDB 1.6.1 with couchperuser plugin
-- `latest`, `2.0.0`: CouchDB 2.0 single node
+- `1.6.1`: CouchDB 1.6.1
+- `1.6.1-couchperuser`: CouchDB 1.6.1 with couchperuser plugin
+- `latest`, `2.1.0`: CouchDB 2.1.0 single node (capable of running in a cluster)
 
 ## Features
 
@@ -20,10 +20,10 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
 * runs everything as user `couchdb` (security ftw!)
 * docker volume for data
 
-## Run (2.0.0/latest)
+## Run (latest/2.1.0)
 
-Available on the docker registry as [klaemo/couchdb:latest](https://index.docker.io/u/klaemo/couchdb/).
-This is a build of the CouchDB 2.0 release. A data volume
+Available on the docker registry as [apache/couchdb:latest](https://hub.docker.com/r/apache/couchdb/).
+This is a build of the CouchDB 2.1 release. A data volume
 is exposed on `/opt/couchdb/data`, and the node's port is exposed on `5984`.
 
 Please note that CouchDB no longer autocreates system tables for you, so you will
@@ -32,7 +32,7 @@ The node will also start in [admin party mode](http://guide.couchdb.org/draft/se
 
 ```bash
 # expose it to the world on port 5984 and use your current directory as the CouchDB Database directory
-[sudo] docker run -p 5984:5984 -v $(pwd):/opt/couchdb/data klaemo/couchdb
+[sudo] docker run -p 5984:5984 -v $(pwd):/opt/couchdb/data apache/couchdb
 18:54:48.780 [info] Application lager started on node nonode@nohost
 18:54:48.780 [info] Application couch_log_lager started on node nonode@nohost
 18:54:48.780 [info] Application couch_mrview started on node nonode@nohost
@@ -45,13 +45,13 @@ Once running, you can visit the new admin interface at `http://dockerhost:5984/_
 
 ## Run (1.6.1)
 
-Available as an official image on Docker Hub as [couchdb](https://hub.docker.com/_/couchdb/)
+Available as an official image on Docker Hub as [apache/couchdb:1.6.1](https://hub.docker.com/r/apache/couchdb/)
 
 ```bash
-[sudo] docker pull couchdb:latest
+[sudo] docker pull apache/couchdb:1.6.1
 
 # expose it to the world on port 5984
-[sudo] docker run -d -p 5984:5984 --name couchdb couchdb
+[sudo] docker run -d -p 5984:5984 --name couchdb apache/couchdb:1.6.1
 
 curl http://localhost:5984
 ```
@@ -60,7 +60,7 @@ curl http://localhost:5984
 
 ```bash
 # expose it to the world on port 5984 and use your current directory as the CouchDB Database directory
-[sudo] docker run -d -p 5984:5984 -v $(pwd):/usr/local/var/lib/couchdb --name couchdb couchdb
+[sudo] docker run -d -p 5984:5984 -v $(pwd):/usr/local/var/lib/couchdb --name couchdb apache/couchdb:1.6.1
 ```
 
 If you want to provide your own config, you can either mount a directory at `/usr/local/etc/couchdb`
@@ -77,7 +77,7 @@ This build includes the `couchperuser` plugin.
 `couchperuser` is a CouchDB plugin daemon that creates per-user databases [github.com/etrepum/couchperuser](https://github.com/etrepum/couchperuser).
 
 ```
-[sudo] docker run -d -p 5984:5984 --name couchdb couchdb:1.6.1-couchperuser
+[sudo] docker run -d -p 5984:5984 --name couchdb apache/couchdb:1.6.1-couchperuser
 ```
 
 ### In a developer cluster
@@ -100,10 +100,9 @@ non-release builds for wide distribution.
 [ * ] Start node node1 ... ok
 [ * ] Start node node2 ... ok
 [ * ] Start node node3 ... ok
-[ * ] Check node at http://127.0.0.1:15984/ ... failed: [Errno socket error] [Errno 111] Connection refused
+[ * ] Check node at http://127.0.0.1:15984/ ... ok
 [ * ] Check node at http://127.0.0.1:25984/ ... ok
 [ * ] Check node at http://127.0.0.1:35984/ ... ok
-[ * ] Check node at http://127.0.0.1:15984/ ... ok
 [ * ] Running cluster setup ... ok
 [ * ] Developers cluster is set up at http://127.0.0.1:15984.
 Admin username: root
@@ -136,7 +135,7 @@ docker run -it -p 15984:15984 -p 25984:25984 <image-hash> -n 2
 
 ## Build your own
 
-You can use `klaemo/couchdb` as the base image for your own couchdb instance.
+You can use `apache/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 your custom CouchDB config
@@ -144,7 +143,7 @@ You might want to provide your own version of the following files:
 Example Dockerfile:
 
 ```
-FROM klaemo/couchdb:latest
+FROM apache/couchdb:latest
 
 COPY local.ini /usr/local/etc/couchdb/local.d/
 ```
@@ -156,7 +155,7 @@ and then build and run
 [sudo] docker run -d -p 5984:5984 -v ~/couchdb:/usr/local/var/lib/couchdb you/awesome-couchdb
 ```
 
-For the `2.0-single` image, configuration is stored at `/opt/couchdb/etc/`.
+For the `2.1` image, configuration is stored at `/opt/couchdb/etc/`.
 
 ## Feedback, Issues, Contributing
 
@@ -168,6 +167,7 @@ use GitHub Issues, do not report anything on Docker's website.
 
 ## Contributors
 
+- [@klaemo](https://github.com/klaemo)
 - [@joeybaker](https://github.com/joeybaker)
 
 [1]: http://mail-archives.apache.org/mod_mbox/couchdb-user/

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.

[couchdb-docker] 01/02: Remove deprecated 2.0.0 image

Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git

commit 751e57e89a0170eb5624efcb33dfd7d7047d71b3
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Tue Sep 19 23:26:56 2017 -0700

    Remove deprecated 2.0.0 image
---
 2.0.0/Dockerfile           | 112 ---------------------------------------------
 2.0.0/docker-entrypoint.sh |  57 -----------------------
 2.0.0/local.ini            |   8 ----
 2.0.0/vm.args              |  28 ------------
 4 files changed, 205 deletions(-)

diff --git a/2.0.0/Dockerfile b/2.0.0/Dockerfile
deleted file mode 100644
index 73d5083..0000000
--- a/2.0.0/Dockerfile
+++ /dev/null
@@ -1,112 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-FROM debian:jessie
-
-MAINTAINER Clemens Stolle klaemo@apache.org
-
-# Add CouchDB user account
-RUN groupadd -r couchdb && useradd -d /opt/couchdb -g couchdb couchdb
-
-RUN apt-get update -y && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    curl \
-    erlang-nox \
-    erlang-reltool \
-    haproxy \
-    libicu52 \
-    libmozjs185-1.0 \
-    openssl \
-  && rm -rf /var/lib/apt/lists/*
-
-# grab gosu for easy step-down from root and tini for signal handling
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-  && curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture)" \
-  && curl -o /usr/local/bin/gosu.asc -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture).asc" \
-  && gpg --verify /usr/local/bin/gosu.asc \
-  && rm /usr/local/bin/gosu.asc \
-  && chmod +x /usr/local/bin/gosu \
-  && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \
-  && curl -o /usr/local/bin/tini -fSL "https://github.com/krallin/tini/releases/download/v0.14.0/tini" \
-  && curl -o /usr/local/bin/tini.asc -fSL "https://github.com/krallin/tini/releases/download/v0.14.0/tini.asc" \
-  && gpg --verify /usr/local/bin/tini.asc \
-  && rm /usr/local/bin/tini.asc \
-  && chmod +x /usr/local/bin/tini
-
-# https://www.apache.org/dist/couchdb/KEYS
-ENV GPG_KEYS \
-  15DD4F3B8AACA54740EB78C7B7B7C53943ECCEE1 \
-  1CFBFA43C19B6DF4A0CA3934669C02FFDF3CEBA3 \
-  25BBBAC113C1BFD5AA594A4C9F96B92930380381 \
-  4BFCA2B99BADC6F9F105BEC9C5E32E2D6B065BFB \
-  5D680346FAA3E51B29DBCB681015F68F9DA248BC \
-  7BCCEB868313DDA925DF1805ECA5BCB7BB9656B0 \
-  C3F4DFAEAD621E1C94523AEEC376457E61D50B88 \
-  D2B17F9DA23C0A10991AF2E3D9EE01E47852AEE4 \
-  E0AF0A194D55C84E4A19A801CDB0C0F904F4EE9B
-RUN set -xe \
-  && for key in $GPG_KEYS; do \
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-  done
-
-ENV COUCHDB_VERSION 2.0.0
-
-# Download dev dependencies
-RUN buildDeps=' \
-    apt-transport-https \
-    gcc \
-    g++ \
-    erlang-dev \
-    libcurl4-openssl-dev \
-    libicu-dev \
-    libmozjs185-dev \
-    make \
-  ' \
- && apt-get update -y -qq && apt-get install -y --no-install-recommends $buildDeps \
- && curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && echo 'deb https://deb.nodesource.com/node_4.x jessie main' > /etc/apt/sources.list.d/nodesource.list \
- && echo 'deb-src https://deb.nodesource.com/node_4.x jessie main' >> /etc/apt/sources.list.d/nodesource.list \
- && apt-get update -y -qq \
- && apt-get install -y nodejs \
- && npm install -g grunt-cli \
- # Acquire CouchDB source code
- && cd /usr/src && mkdir couchdb \
- && curl -fSL https://dist.apache.org/repos/dist/release/couchdb/source/$COUCHDB_VERSION/apache-couchdb-$COUCHDB_VERSION.tar.gz -o couchdb.tar.gz \
- && curl -fSL https://dist.apache.org/repos/dist/release/couchdb/source/$COUCHDB_VERSION/apache-couchdb-$COUCHDB_VERSION.tar.gz.asc -o couchdb.tar.gz.asc \
- && gpg --verify couchdb.tar.gz.asc \
- && tar -xzf couchdb.tar.gz -C couchdb --strip-components=1 \
- && cd couchdb \
- # Build the release and install into /opt
- && ./configure --disable-docs \
- && make release \
- && mv /usr/src/couchdb/rel/couchdb /opt/ \
- # Cleanup build detritus
- && apt-get purge -y --auto-remove $buildDeps \
- && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb*
-
-# Add configuration
-COPY local.ini /opt/couchdb/etc/local.d/
-COPY vm.args /opt/couchdb/etc/
-
-COPY ./docker-entrypoint.sh /
-
-# Setup directories and permissions
-RUN chmod +x /docker-entrypoint.sh \
- && mkdir /opt/couchdb/data /opt/couchdb/etc/default.d \
- && chown -R couchdb:couchdb /opt/couchdb/
-
-WORKDIR /opt/couchdb
-EXPOSE 5984 4369 9100
-VOLUME ["/opt/couchdb/data"]
-
-ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
-CMD ["/opt/couchdb/bin/couchdb"]
diff --git a/2.0.0/docker-entrypoint.sh b/2.0.0/docker-entrypoint.sh
deleted file mode 100755
index 2ff1715..0000000
--- a/2.0.0/docker-entrypoint.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-set -e
-
-if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
-	# we need to set the permissions here because docker mounts volumes as root
-	chown -R couchdb:couchdb /opt/couchdb
-
-	chmod -R 0770 /opt/couchdb/data
-
-	chmod 664 /opt/couchdb/etc/*.ini
-	chmod 664 /opt/couchdb/etc/local.d/*.ini
-	chmod 775 /opt/couchdb/etc/*.d
-
-	if [ ! -z "$NODENAME" ] && ! grep "couchdb@" /opt/couchdb/etc/vm.args; then
-		echo "-name couchdb@$NODENAME" >> /opt/couchdb/etc/vm.args
-	fi
-
-	if [ "$COUCHDB_USER" ] && [ "$COUCHDB_PASSWORD" ]; then
-		# Create admin
-		printf "[admins]\n%s = %s\n" "$COUCHDB_USER" "$COUCHDB_PASSWORD" > /opt/couchdb/etc/local.d/docker.ini
-		chown couchdb:couchdb /opt/couchdb/etc/local.d/docker.ini
-	fi
-
-	# if we don't find an [admins] section followed by a non-comment, display a warning
-	if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /opt/couchdb/etc/local.d/*.ini; then
-		# The - option suppresses leading tabs but *not* spaces. :)
-		cat >&2 <<-'EOWARN'
-			****************************************************
-			WARNING: CouchDB is running in Admin Party mode.
-			         This will allow anyone with access to the
-			         CouchDB port to access your database. In
-			         Docker's default configuration, this is
-			         effectively any other container on the same
-			         system.
-			         Use "-e COUCHDB_USER=admin -e COUCHDB_PASSWORD=password"
-			         to set it in "docker run".
-			****************************************************
-		EOWARN
-	fi
-
-
-	exec gosu couchdb "$@"
-fi
-
-exec "$@"
diff --git a/2.0.0/local.ini b/2.0.0/local.ini
deleted file mode 100644
index 1aa633c..0000000
--- a/2.0.0/local.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-; CouchDB Configuration Settings
-
-; Custom settings should be made in this file. They will override settings
-; in default.ini, but unlike changes made to default.ini, this file won't be
-; overwritten on server upgrade.
-
-[chttpd]
-bind_address = any
diff --git a/2.0.0/vm.args b/2.0.0/vm.args
deleted file mode 100644
index 0425756..0000000
--- a/2.0.0/vm.args
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-# Ensure that the Erlang VM listens on a known port
--kernel inet_dist_listen_min 9100
--kernel inet_dist_listen_max 9100
-
-# Tell kernel and SASL not to log anything
--kernel error_logger silent
--sasl sasl_error_logger false
-
-# Use kernel poll functionality if supported by emulator
-+K true
-
-# Start a pool of asynchronous IO threads
-+A 16
-
-# Comment this line out to enable the interactive Erlang shell on startup
-+Bd -noinput

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.