You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2017/04/25 12:38:12 UTC
[couchdb-docker] branch master updated (fe82d87 -> c648704)
This is an automated email from the ASF dual-hosted git repository.
garren pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git.
from fe82d87 couchperuser: FROM official image
new 5f2878c 1.6: explicitly make entrypoint executable
new 2a3d644 1.6: allow configuration of admin user via env vars (#46)
new 29ed699 improve admin-party detection (#53)
new 8db81f5 add Travis CI
new efff00e Add Dockerfile for CouchDB 2.0 production
new a9cb1dd Improve CouchDB 2.0 production image
new 196e933 Fix couchdb2-single image (#59)
new 557f3c8 1.6: allow admin user/password special chars (#60) (#61)
new a1b01ad add initial 2.0-rc2 image (#64)
new 8c9f748 2.0-dev: pin to RC2
new 287d340 update readme
new 1474615 2.0.0-RC3
new f3997db fix travis build
new 5382c3b 2.0: bump to RC4 (#69)
new eb02689 update readme
new d26935b 2.0: attempt to fix 2.0-dev
new 12e1f84 add 2.0.0-rc1-vote \U0001f389 (#74)
new f163791 2.0-dev: update to latest RC
new 6ec6a78 remove 2.0-single
new f9340c3 2.0.0-rc1-vote: remove unused haproxy
new d76577d update readme
new 10ed47c fix up readme
new 36b0c6d add 2.0.0 based on 2.0.0-rc1-vote (#75)
new 6ceb87f update readme
new 291a023 readd haproxy (#79)
new 1666c2e Added environment-based admin user/pass (#81)
new eef004e Remove "latest" tag from 1.6.1. (#89)
new 09f767d Clarify which sections in README are for 1.6 and 2.0 (latest) (#90)
new 62030f9 fix reference to -single image
new 4273266 Relax CouchDB v2 entry point ini (#91)
new e65ab09 remove old images
new f253c65 fix 2.0-dev
new 2635562 Adding the option to set a nodename using an environment variable.
new b1bd23d point travis to correct images
new 0efab51 Add COUCHDB_HTTP_PORT/BIND_ADDRESS to 1.6.1 (#92)
new cb252b2 Dockerfile puts local.ini in /opt/couchdb/etc/, not local.d. (#99)
new 7c5c23a Update README.md with info about the creation of system tables in 2.0 (#103)
new a8f7cd5 1.6.1: update tini
new c648704 2.0.0: update tini and add gpg verification
The 39 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 14 ++++
1.6.1/Dockerfile | 5 +-
1.6.1/docker-entrypoint.sh | 59 +++++++++++-----
2.0-dev/Dockerfile | 59 ++++++++++------
{1.6.1 => 2.0.0}/Dockerfile | 79 ++++++++++++----------
2.0.0/docker-entrypoint.sh | 57 ++++++++++++++++
2.0.0/local.ini | 8 +++
.../docker-entrypoint.sh => 2.0.0/vm.args | 31 ++++-----
README.md | 62 +++++++++++++----
9 files changed, 268 insertions(+), 106 deletions(-)
create mode 100644 .travis.yml
copy {1.6.1 => 2.0.0}/Dockerfile (56%)
create mode 100755 2.0.0/docker-entrypoint.sh
create mode 100644 2.0.0/local.ini
copy 1.6.1-couchperuser/docker-entrypoint.sh => 2.0.0/vm.args (50%)
mode change 100755 => 100644
--
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].
[couchdb-docker] 20/39: 2.0.0-rc1-vote: remove unused haproxy
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit f9340c37c6ce55b9e948fa66308654723690964a
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Thu Sep 15 22:19:35 2016 +0200
2.0.0-rc1-vote: remove unused haproxy
---
2.0.0-rc1-vote/Dockerfile | 1 -
1 file changed, 1 deletion(-)
diff --git a/2.0.0-rc1-vote/Dockerfile b/2.0.0-rc1-vote/Dockerfile
index 07d9522..dc180d5 100644
--- a/2.0.0-rc1-vote/Dockerfile
+++ b/2.0.0-rc1-vote/Dockerfile
@@ -24,7 +24,6 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
erlang-reltool \
libicu52 \
libmozjs185-1.0 \
- haproxy \
openssl \
&& rm -rf /var/lib/apt/lists/*
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 30/39: Relax CouchDB v2 entry point ini (#91)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 42732662fc9c9d84d9c833e56391780902ea3ae3
Author: Tom Vincent <gi...@tlvince.com>
AuthorDate: Thu Nov 3 16:49:14 2016 +0000
Relax CouchDB v2 entry point ini (#91)
`admins` could be set in any ini file, so allow it.
---
2.0.0/docker-entrypoint.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/2.0.0/docker-entrypoint.sh b/2.0.0/docker-entrypoint.sh
index 62b14fa..9441a03 100755
--- a/2.0.0/docker-entrypoint.sh
+++ b/2.0.0/docker-entrypoint.sh
@@ -29,7 +29,7 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
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/docker.ini; then
+ if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /opt/couchdb/etc/local.d/*.ini; then
# The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN'
****************************************************
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 22/39: fix up readme
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 10ed47c299b72f5df78a3c8aabf89154c4c32aaa
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Thu Sep 15 22:21:35 2016 +0200
fix up readme
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 9658b80..09a8302 100644
--- a/README.md
+++ b/README.md
@@ -7,14 +7,14 @@ 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 (dev): `CouchDB 2.0 master`, `Erlang 17.3`
+- Version (dev): `CouchDB 2.0.0-rc1-vote`, `Erlang 17.3`
## Available tags
- `1`, `1.6`, `1.6.1`, `latest`: CouchDB 1.6.1
- `1-couchperuser`, `1.6-couchperuser`, `1.6.1-couchperuser`: CouchDB 1.6.1 with couchperuser plugin
- `2.0-dev`: CouchDB 2.0 RC.1 (release vote) with preconfigured dev cluster
-- `latest`, 2.0.0-rc1-vote`: CouchDB 2.0 RC.1 (release vote) single node
+- `latest`, `2.0.0-rc1-vote`: CouchDB 2.0 RC.1 (release vote) single node
- `2.0-dev-docs`: CouchDB 2.0 master (development version) with preconfigured dev cluster and documentation
## Features
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 27/39: Remove "latest" tag from 1.6.1. (#89)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit eef004e22f3626673fc877f8ff8ad9409dc7ceee
Author: jrop <jr...@gmail.com>
AuthorDate: Tue Oct 25 02:49:18 2016 -0600
Remove "latest" tag from 1.6.1. (#89)
Fixes #80
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index a24708a..dd2e7f9 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
## Available tags
-- `1`, `1.6`, `1.6.1`, `latest`: CouchDB 1.6.1
+- `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
- `2.0-dev`: CouchDB 2.0 RC.1 (release vote) with preconfigured dev cluster
- `latest`, `2.0.0`: CouchDB 2.0 single node
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 24/39: update readme
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 6ceb87f19e67b61191c036527272d83f096b5632
Author: Clemens Stolle <kl...@fastmail.fm>
AuthorDate: Tue Sep 20 17:38:38 2016 +0200
update readme
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 09a8302..a24708a 100644
--- a/README.md
+++ b/README.md
@@ -7,14 +7,14 @@ 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 (dev): `CouchDB 2.0.0-rc1-vote`, `Erlang 17.3`
+- Version (stable): `CouchDB 2.0.0`, `Erlang 17.3`
## Available tags
- `1`, `1.6`, `1.6.1`, `latest`: CouchDB 1.6.1
- `1-couchperuser`, `1.6-couchperuser`, `1.6.1-couchperuser`: CouchDB 1.6.1 with couchperuser plugin
- `2.0-dev`: CouchDB 2.0 RC.1 (release vote) with preconfigured dev cluster
-- `latest`, `2.0.0-rc1-vote`: CouchDB 2.0 RC.1 (release vote) single node
+- `latest`, `2.0.0`: CouchDB 2.0 single node
- `2.0-dev-docs`: CouchDB 2.0 master (development version) with preconfigured dev cluster and documentation
## Features
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 34/39: point travis to correct images
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit b1bd23d8ffd6f10bd84ab6f145a10ad2d8d00a9c
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Sun Nov 13 12:13:10 2016 +0100
point travis to correct images
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ea3b05b..ad06a7c 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-rc1-vote 2.0.0-rc1-vote
+ - docker build -t couchdb:2.0.0 2.0.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-rc1-vote && sleep 5 && curl http://localhost:5986
+ - docker run -d -p 5986:5984 couchdb:2.0.0 && sleep 5 && curl http://localhost:5986
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 15/39: update readme
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit eb026897fb82f079ce3862ebcfb35bec131525db
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Wed Aug 17 22:20:36 2016 +0200
update readme
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 662160b..825d1ee 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
- `1`, `1.6`, `1.6.1`, `latest`: CouchDB 1.6.1
- `1-couchperuser`, `1.6-couchperuser`, `1.6.1-couchperuser`: CouchDB 1.6.1 with couchperuser plugin
-- `2.0-dev`: CouchDB 2.0 RC2 (development version) with preconfigured dev cluster
-- `2.0-rc2`: CouchDB 2.0 RC2 (development version) single node
+- `2.0-dev`: CouchDB 2.0 RC4 (development version) with preconfigured dev cluster
+- `2.0-rc4`: CouchDB 2.0 RC4 (development version) single node
- `2.0-dev-docs`: CouchDB 2.0 master (development version) with preconfigured dev cluster and documentation
- `2.0-single`: CouchDB 2.0 master (development version)
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 09/39: add initial 2.0-rc2 image (#64)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit a1b01ad5d6297888b2b2b8a1d56990fa7d668252
Author: Clemens Stolle <kl...@fastmail.fm>
AuthorDate: Thu Jul 21 22:37:14 2016 +0200
add initial 2.0-rc2 image (#64)
---
.travis.yml | 2 ++
2.0-rc2/Dockerfile | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2.0-rc2/local.ini | 8 +++++
2.0-rc2/vm.args | 28 ++++++++++++++++++
4 files changed, 124 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 9ce7214..5916c7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +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-rc2 2.0-rc2
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-rc2 && sleep 5 && curl http://localhost:5986
diff --git a/2.0-rc2/Dockerfile b/2.0-rc2/Dockerfile
new file mode 100644
index 0000000..b1adccb
--- /dev/null
+++ b/2.0-rc2/Dockerfile
@@ -0,0 +1,86 @@
+# 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 \
+ libicu52 \
+ libmozjs185-1.0 \
+ haproxy \
+ openssl \
+ && rm -rf /var/lib/apt/lists/*
+
+# Pin to an arbitrary commit for a deterministic build
+# Once CouchDB has an actual 2.0 tag, we can use that
+ENV COUCHDB_VERSION 2.0.0-RC2
+
+# Download dev dependencies
+RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
+ apt-transport-https \
+ build-essential \
+ erlang-dev \
+ libcurl4-openssl-dev \
+ libicu-dev \
+ libmozjs185-dev \
+ && 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://couchdb-ci.s3-eu-west-1.amazonaws.com/release-candidate/apache-couchdb-$COUCHDB_VERSION.tar.gz -o couchdb.tar.gz \
+ && 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 \
+ binutils \
+ build-essential \
+ cpp \
+ erlang-dev \
+ git \
+ libicu-dev \
+ make \
+ nodejs \
+ perl \
+ && apt-get autoremove -y && apt-get clean \
+ && apt-get install -y libicu52 --no-install-recommends \
+ && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb*
+
+# Add configuration
+COPY local.ini /opt/couchdb/etc/
+COPY vm.args /opt/couchdb/etc/
+
+# Setup directory permissions
+RUN mkdir -p /opt/couchdb/data \
+ && chown -R couchdb:couchdb /opt/couchdb/
+
+USER couchdb
+WORKDIR /opt/couchdb
+EXPOSE 5984 4369 9100
+VOLUME ["/opt/couchdb/data"]
+
+ENTRYPOINT ["/opt/couchdb/bin/couchdb"]
diff --git a/2.0-rc2/local.ini b/2.0-rc2/local.ini
new file mode 100644
index 0000000..1aa633c
--- /dev/null
+++ b/2.0-rc2/local.ini
@@ -0,0 +1,8 @@
+; 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-rc2/vm.args b/2.0-rc2/vm.args
new file mode 100644
index 0000000..0425756
--- /dev/null
+++ b/2.0-rc2/vm.args
@@ -0,0 +1,28 @@
+# 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>.
[couchdb-docker] 04/39: add Travis CI
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 8db81f57c6b64753b51c23143af70363582198ff
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Tue May 24 23:33:05 2016 +0200
add Travis CI
---
.travis.yml | 12 ++++++++++++
README.md | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..9ce7214
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,12 @@
+sudo: required
+
+services:
+ - docker
+
+before_install:
+ - docker build -t couchdb:1.6.1 1.6.1
+ - docker build -t couchdb:1.6.1-couchperuser 1.6.1-couchperuser
+
+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
diff --git a/README.md b/README.md
index 98cfd9e..a27e258 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-YADC
+YADC [](https://travis-ci.org/klaemo/docker-couchdb)
===
Yet Another Dockerized CouchDB.
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 36/39: Dockerfile puts local.ini in
/opt/couchdb/etc/, not local.d. (#99)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit cb252b2a9cade1a850f640b92321304d207b5891
Author: Victor Heng <ba...@gmail.com>
AuthorDate: Fri Jan 27 13:28:56 2017 -0800
Dockerfile puts local.ini in /opt/couchdb/etc/, not local.d. (#99)
---
2.0.0/Dockerfile | 4 ++--
2.0.0/docker-entrypoint.sh | 1 +
README.md | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/2.0.0/Dockerfile b/2.0.0/Dockerfile
index 3f76b8b..c74f90f 100644
--- a/2.0.0/Dockerfile
+++ b/2.0.0/Dockerfile
@@ -83,14 +83,14 @@ RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb*
# Add configuration
-COPY local.ini /opt/couchdb/etc/
+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/local.d /opt/couchdb/etc/default.d \
+ && mkdir /opt/couchdb/data /opt/couchdb/etc/default.d \
&& chown -R couchdb:couchdb /opt/couchdb/
WORKDIR /opt/couchdb
diff --git a/2.0.0/docker-entrypoint.sh b/2.0.0/docker-entrypoint.sh
index 33da092..2ff1715 100755
--- a/2.0.0/docker-entrypoint.sh
+++ b/2.0.0/docker-entrypoint.sh
@@ -20,6 +20,7 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
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
diff --git a/README.md b/README.md
index b1ee837..e2d0e13 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ Example Dockerfile:
```
FROM klaemo/couchdb:latest
-COPY local.ini /usr/local/etc/couchdb/
+COPY local.ini /usr/local/etc/couchdb/local.d/
```
and then build and run
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 06/39: Improve CouchDB 2.0 production image
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit a9cb1dd50907b07b7c0f6da80e485ceaf5b8971f
Author: Chris Foster <ch...@gmail.com>
AuthorDate: Fri Jun 17 12:11:35 2016 -0700
Improve CouchDB 2.0 production image
- properly use /opt/couchdb/data for the volume
- remove an unneeded couchdb.config file
- EXPOSE ports all on one line
- rename it to 2.0-single, since it's not actually production
closes #56
---
2.0-prod/couchdb.config | 21 ------------------
{2.0-prod => 2.0-single}/Dockerfile | 43 +++++++++++++++++++------------------
{2.0-prod => 2.0-single}/local.ini | 0
{2.0-prod => 2.0-single}/vm.args | 0
README.md | 34 ++++++++++++++++++++++++++---
5 files changed, 53 insertions(+), 45 deletions(-)
diff --git a/2.0-prod/couchdb.config b/2.0-prod/couchdb.config
deleted file mode 100644
index 7c0fa6b..0000000
--- a/2.0-prod/couchdb.config
+++ /dev/null
@@ -1,21 +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.
-%
-{package_author_name, "The Apache Software Foundation"}.
-{prefix, "."}.
-{data_dir, "/var/lib/couchdb"}.
-{view_index_dir, "/var/lib/couchdb"}.
-{log_file, ""}.
-{fauxton_root, "./share/www"}.
-{user, "couchdb"}.
-{cluster_port, 5984}.
-{backend_port, 5986}.
diff --git a/2.0-prod/Dockerfile b/2.0-single/Dockerfile
similarity index 73%
rename from 2.0-prod/Dockerfile
rename to 2.0-single/Dockerfile
index fb998c7..9aabbb1 100644
--- a/2.0-prod/Dockerfile
+++ b/2.0-single/Dockerfile
@@ -14,13 +14,13 @@ FROM debian:jessie
MAINTAINER Clemens Stolle klaemo@apache.org
-ENV COUCHDB_VERSION master
-
-
-RUN groupadd -r couchdb && useradd -d /opt/couchdb -g couchdb couchdb
+# Pin to an arbitrary commit for a deterministic build
+# Once CouchDB has an actual 2.0 tag, we can use that
+ENV COUCHDB_VERSION 1b38ccd
# Download dependencies
-RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
+RUN apt-get update -y -qq \
+ && apt-get install -y --no-install-recommends \
apt-transport-https \
build-essential \
ca-certificates \
@@ -38,23 +38,19 @@ RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
&& 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 \
+ && apt-get update -y -qq \
+ && apt-get install -y nodejs \
&& npm install -g grunt-cli \
-# Acquire and configure CouchDB source code
+ # Acquire CouchDB source code
&& cd /usr/src \
&& git clone --depth 1 https://git-wip-us.apache.org/repos/asf/couchdb.git \
&& cd couchdb \
&& git checkout $COUCHDB_VERSION \
- && ./configure \
- --disable-docs \
- --databasedir /var/lib/couchdb \
- --viewindexdir /var/lib/couchdb \
-# Build the release and install into /opt
+ # Build the release and install into /opt
+ && ./configure --disable-docs \
&& make build \
&& mv /usr/src/couchdb/rel/couchdb /opt/ \
- && mkdir -p /var/lib/couchdb \
- && chown -R couchdb:couchdb /opt/couchdb /var/lib/couchdb \
-# Cleanup build detritus
+ # Cleanup build detritus
&& apt-get purge -y \
binutils \
build-essential \
@@ -69,16 +65,21 @@ RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
&& apt-get install -y libicu52 --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb
-# Now override some of the configuration
+# Add configuration
COPY local.ini /opt/couchdb/etc/
COPY vm.args /opt/couchdb/etc/
-RUN chown couchdb:couchdb /opt/couchdb/etc/*
-VOLUME ["/var/lib/couchdb"]
+# Add CouchDB user account
+RUN groupadd -r couchdb \
+ && useradd -d /opt/couchdb -g couchdb couchdb
+
+# Setup directory permissions
+RUN mkdir -p /opt/couchdb/data \
+ && chown -R couchdb:couchdb /opt/couchdb/
+
USER couchdb
-EXPOSE 5984
-EXPOSE 4369
-EXPOSE 9100
WORKDIR /opt/couchdb
+EXPOSE 5984 4369 9100
+VOLUME ["/opt/couchdb/data"]
ENTRYPOINT ["/opt/couchdb/bin/couchdb"]
diff --git a/2.0-prod/local.ini b/2.0-single/local.ini
similarity index 100%
rename from 2.0-prod/local.ini
rename to 2.0-single/local.ini
diff --git a/2.0-prod/vm.args b/2.0-single/vm.args
similarity index 100%
rename from 2.0-prod/vm.args
rename to 2.0-single/vm.args
diff --git a/README.md b/README.md
index a27e258..e798786 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,9 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
- `1`, `1.6`, `1.6.1`, `latest`: CouchDB 1.6.1
- `1-couchperuser`, `1.6-couchperuser`, `1.6.1-couchperuser`: CouchDB 1.6.1 with couchperuser plugin
-- `2.0-dev`: CouchDB 2.0 master (development version)
-- `2.0-dev-docs`: CouchDB 2.0 master (development version) with documentation
+- `2.0-dev`: CouchDB 2.0 master (development version) with preconfigured dev cluster
+- `2.0-dev-docs`: CouchDB 2.0 master (development version) with preconfigured dev cluster and documentation
+- `2.0-single`: CouchDB 2.0 master (development version)
## Features
@@ -57,7 +58,32 @@ This build includes the `couchperuser` plugin.
## Run (dev)
-Available on the docker registry as [klaemo/couchdb:2.0-dev](https://index.docker.io/u/klaemo/couchdb/)
+Available on the docker registry as [klaemo/couchdb:2.0-single](https://index.docker.io/u/klaemo/couchdb/).
+This is a developer preview of the upcoming CouchDB 2.0 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
+have to create `_global_changes`, `_metadata`, `_replicator` and `_users` manually.
+The node will also start in [admin party mode](http://guide.couchdb.org/draft/security.html#party)!
+
+```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:2.0-single
+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
+18:54:48.780 [info] Application couch_plugins started on node nonode@nohost
+[...]
+```
+
+Once running, you can visit the new admin interface at `http://dockerhost:5984/_utils/`
+
+### In a developer cluster
+
+Available on the docker registry as [klaemo/couchdb:2.0-dev](https://index.docker.io/u/klaemo/couchdb/).
+This build demonstrates the CouchDB clustering features by creating a local
+cluster of a default three nodes inside the container, with a proxy in front.
+This is great for testing clustering in your local environment.
```bash
# expose the cluster to the world
@@ -125,6 +151,8 @@ 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/`.
+
## Feedback, Issues, Contributing
**Please use Github issues for any questions, bugs, feature requests. :)**
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 19/39: remove 2.0-single
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 6ec6a7805b271b23bfafba5c2be7ddef921b047a
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Thu Sep 15 22:18:59 2016 +0200
remove 2.0-single
---
2.0-single/Dockerfile | 85 ---------------------------------------------------
2.0-single/local.ini | 8 -----
2.0-single/vm.args | 28 -----------------
3 files changed, 121 deletions(-)
diff --git a/2.0-single/Dockerfile b/2.0-single/Dockerfile
deleted file mode 100644
index 0e56ca3..0000000
--- a/2.0-single/Dockerfile
+++ /dev/null
@@ -1,85 +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
-
-# Pin to an arbitrary commit for a deterministic build
-# Once CouchDB has an actual 2.0 tag, we can use that
-ENV COUCHDB_VERSION 1b38ccd0294ad17d719655612b14b00160168dfd
-
-# Download dependencies
-RUN apt-get update -y -qq \
- && apt-get install -y --no-install-recommends \
- apt-transport-https \
- build-essential \
- ca-certificates \
- curl \
- erlang-dev \
- erlang-nox \
- erlang-reltool \
- git \
- haproxy \
- libcurl4-openssl-dev \
- libicu-dev \
- libmozjs185-dev \
- openssl \
- python \
- && 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 \
- && git clone --single-branch https://git-wip-us.apache.org/repos/asf/couchdb.git \
- && cd couchdb \
- && git checkout $COUCHDB_VERSION \
- # Build the release and install into /opt
- && ./configure --disable-docs \
- && make build \
- && mv /usr/src/couchdb/rel/couchdb /opt/ \
- # Cleanup build detritus
- && apt-get purge -y \
- binutils \
- build-essential \
- cpp \
- erlang-dev \
- git \
- libicu-dev \
- make \
- nodejs \
- perl \
- && apt-get autoremove -y && apt-get clean \
- && apt-get install -y libicu52 --no-install-recommends \
- && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb
-
-# Add configuration
-COPY local.ini /opt/couchdb/etc/
-COPY vm.args /opt/couchdb/etc/
-
-# Add CouchDB user account
-RUN groupadd -r couchdb \
- && useradd -d /opt/couchdb -g couchdb couchdb
-
-# Setup directory permissions
-RUN mkdir -p /opt/couchdb/data \
- && chown -R couchdb:couchdb /opt/couchdb/
-
-USER couchdb
-WORKDIR /opt/couchdb
-EXPOSE 5984 4369 9100
-VOLUME ["/opt/couchdb/data"]
-
-ENTRYPOINT ["/opt/couchdb/bin/couchdb"]
diff --git a/2.0-single/local.ini b/2.0-single/local.ini
deleted file mode 100644
index 1aa633c..0000000
--- a/2.0-single/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-single/vm.args b/2.0-single/vm.args
deleted file mode 100644
index 0425756..0000000
--- a/2.0-single/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>.
[couchdb-docker] 02/39: 1.6: allow configuration of admin user via
env vars (#46)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 2a3d644e868b7977e82acca14e5d4e3e7b3092a5
Author: Clemens Stolle <kl...@fastmail.fm>
AuthorDate: Fri May 6 17:38:10 2016 +0200
1.6: allow configuration of admin user via env vars (#46)
---
1.6.1/docker-entrypoint.sh | 62 ++++++++++++++++++++++++++++++++++------------
1 file changed, 46 insertions(+), 16 deletions(-)
diff --git a/1.6.1/docker-entrypoint.sh b/1.6.1/docker-entrypoint.sh
index ba4dac3..763d285 100755
--- a/1.6.1/docker-entrypoint.sh
+++ b/1.6.1/docker-entrypoint.sh
@@ -14,22 +14,52 @@
set -e
if [ "$1" = 'couchdb' ]; then
- # we need to set the permissions here because docker mounts volumes as root
- chown -R couchdb:couchdb \
- /usr/local/var/lib/couchdb \
- /usr/local/var/log/couchdb \
- /usr/local/var/run/couchdb \
- /usr/local/etc/couchdb
-
- chmod -R 0770 \
- /usr/local/var/lib/couchdb \
- /usr/local/var/log/couchdb \
- /usr/local/var/run/couchdb \
- /usr/local/etc/couchdb
-
- chmod 664 /usr/local/etc/couchdb/*.ini
- chmod 775 /usr/local/etc/couchdb/*.d
- exec gosu couchdb "$@"
+
+ if [ "$COUCHDB_USER" ] && [ "$COUCHDB_PASSWORD" ]; then
+ # Create admin
+ printf "[admins]\n$COUCHDB_USER = $COUCHDB_PASSWORD\n" > /usr/local/etc/couchdb/local.d/docker.ini
+ fi
+
+ # Start CouchDB
+ couchdb -b > /dev/null 2>&1
+ while ! curl -s 127.0.0.1:5984 > /dev/null; do sleep 1; done
+
+ if [ "$(curl -s 127.0.0.1:5984/_config/admins)" == "{}" ]; 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
+
+ # Stop CouchDB
+ couchdb -d > /dev/null 2>&1
+
+ # we need to set the permissions here because docker mounts volumes as root
+ chown -R couchdb:couchdb \
+ /usr/local/var/lib/couchdb \
+ /usr/local/var/log/couchdb \
+ /usr/local/var/run/couchdb \
+ /usr/local/etc/couchdb
+
+ chmod -R 0770 \
+ /usr/local/var/lib/couchdb \
+ /usr/local/var/log/couchdb \
+ /usr/local/var/run/couchdb \
+ /usr/local/etc/couchdb
+
+ chmod 664 /usr/local/etc/couchdb/*.ini
+ chmod 775 /usr/local/etc/couchdb/*.d
+
+ exec gosu couchdb "$@"
fi
exec "$@"
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 08/39: 1.6: allow admin user/password special
chars (#60) (#61)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 557f3c87c82fc87f360a09200ee567766cfb819e
Author: Alexander Harding <ae...@gmail.com>
AuthorDate: Wed Jul 20 09:36:55 2016 -0500
1.6: allow admin user/password special chars (#60) (#61)
Using the % symbol is reserved in the printf format string
---
1.6.1/docker-entrypoint.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/1.6.1/docker-entrypoint.sh b/1.6.1/docker-entrypoint.sh
index 180d075..d18a33a 100755
--- a/1.6.1/docker-entrypoint.sh
+++ b/1.6.1/docker-entrypoint.sh
@@ -32,7 +32,7 @@ if [ "$1" = 'couchdb' ]; then
if [ "$COUCHDB_USER" ] && [ "$COUCHDB_PASSWORD" ]; then
# Create admin
- printf "[admins]\n$COUCHDB_USER = $COUCHDB_PASSWORD\n" > /usr/local/etc/couchdb/local.d/docker.ini
+ printf "[admins]\n%s = %s\n" "$COUCHDB_USER" "$COUCHDB_PASSWORD" > /usr/local/etc/couchdb/local.d/docker.ini
chown couchdb:couchdb /usr/local/etc/couchdb/local.d/docker.ini
fi
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 16/39: 2.0: attempt to fix 2.0-dev
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit d26935b744226108c59508cab794b7b3254189f7
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Wed Aug 17 22:27:39 2016 +0200
2.0: attempt to fix 2.0-dev
---
2.0-dev/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/2.0-dev/Dockerfile b/2.0-dev/Dockerfile
index 3b12bb2..7653807 100644
--- a/2.0-dev/Dockerfile
+++ b/2.0-dev/Dockerfile
@@ -38,8 +38,8 @@ RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
&& 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 \
- && cd /usr/src && git clone --depth 1 https://git-wip-us.apache.org/repos/asf/couchdb.git \
- && cd couchdb && git checkout $COUCHDB_VERSION \
+ && cd /usr/src && git clone https://git-wip-us.apache.org/repos/asf/couchdb.git \
+ && cd couchdb && git checkout tags/$COUCHDB_VERSION \
&& cd /usr/src/couchdb && ./configure --disable-docs && make \
&& apt-get purge -y \
binutils \
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 07/39: Fix couchdb2-single image (#59)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 196e933ea6a7c0ed57f20b0ce8789681dd710c31
Author: Chris Foster <ch...@gmail.com>
AuthorDate: Wed Jun 29 10:58:53 2016 -0700
Fix couchdb2-single image (#59)
---
2.0-single/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/2.0-single/Dockerfile b/2.0-single/Dockerfile
index 9aabbb1..0e56ca3 100644
--- a/2.0-single/Dockerfile
+++ b/2.0-single/Dockerfile
@@ -16,7 +16,7 @@ MAINTAINER Clemens Stolle klaemo@apache.org
# Pin to an arbitrary commit for a deterministic build
# Once CouchDB has an actual 2.0 tag, we can use that
-ENV COUCHDB_VERSION 1b38ccd
+ENV COUCHDB_VERSION 1b38ccd0294ad17d719655612b14b00160168dfd
# Download dependencies
RUN apt-get update -y -qq \
@@ -43,7 +43,7 @@ RUN apt-get update -y -qq \
&& npm install -g grunt-cli \
# Acquire CouchDB source code
&& cd /usr/src \
- && git clone --depth 1 https://git-wip-us.apache.org/repos/asf/couchdb.git \
+ && git clone --single-branch https://git-wip-us.apache.org/repos/asf/couchdb.git \
&& cd couchdb \
&& git checkout $COUCHDB_VERSION \
# Build the release and install into /opt
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 25/39: readd haproxy (#79)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 291a0235c0dc4815171c78ecabe72799470fffe8
Author: Robert Kowalski <ro...@kowalski.gd>
AuthorDate: Sat Oct 8 17:23:42 2016 +0200
readd haproxy (#79)
this readds haproxy as a dependency. this way you can pass
`--with-haproxy` as a flag again and expose couchdb on 5984
closes #78
---
2.0-dev/Dockerfile | 1 +
2.0.0-rc1-vote/Dockerfile | 1 +
2.0.0/Dockerfile | 1 +
3 files changed, 3 insertions(+)
diff --git a/2.0-dev/Dockerfile b/2.0-dev/Dockerfile
index 5f586e3..2c3b957 100644
--- a/2.0-dev/Dockerfile
+++ b/2.0-dev/Dockerfile
@@ -20,6 +20,7 @@ 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 \
+ haproxy \
erlang-nox \
erlang-reltool \
libicu52 \
diff --git a/2.0.0-rc1-vote/Dockerfile b/2.0.0-rc1-vote/Dockerfile
index dc180d5..94136fc 100644
--- a/2.0.0-rc1-vote/Dockerfile
+++ b/2.0.0-rc1-vote/Dockerfile
@@ -20,6 +20,7 @@ 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 \
+ haproxy \
erlang-nox \
erlang-reltool \
libicu52 \
diff --git a/2.0.0/Dockerfile b/2.0.0/Dockerfile
index 324ca5b..3f76b8b 100644
--- a/2.0.0/Dockerfile
+++ b/2.0.0/Dockerfile
@@ -20,6 +20,7 @@ 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 \
+ haproxy \
erlang-nox \
erlang-reltool \
libicu52 \
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 33/39: Adding the option to set a nodename using
an environment variable.
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 2635562ce1323fafb38d860680afd25efe1bc2eb
Author: Romain Brucker <ro...@amalto.com>
AuthorDate: Tue Oct 4 15:08:31 2016 -0500
Adding the option to set a nodename using an environment variable.
closes #82
---
2.0.0/docker-entrypoint.sh | 4 ++++
README.md | 1 +
2 files changed, 5 insertions(+)
diff --git a/2.0.0/docker-entrypoint.sh b/2.0.0/docker-entrypoint.sh
index 9441a03..33da092 100755
--- a/2.0.0/docker-entrypoint.sh
+++ b/2.0.0/docker-entrypoint.sh
@@ -22,6 +22,10 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
chmod 664 /opt/couchdb/etc/*.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
diff --git a/README.md b/README.md
index d0fc0d6..adbd17a 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ The node will also start in [admin party mode](http://guide.couchdb.org/draft/se
[...]
```
+Note that you can also use the NODENAME environment variable to set the name of the CouchDB node inside the container.
Once running, you can visit the new admin interface at `http://dockerhost:5984/_utils/`
## Run (1.6.1)
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 23/39: add 2.0.0 based on 2.0.0-rc1-vote (#75)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 36b0c6d7012bdfd6f9107307e47ab95841b1c0be
Author: Daniel Holth <dh...@fastmail.fm>
AuthorDate: Tue Sep 20 11:36:04 2016 -0400
add 2.0.0 based on 2.0.0-rc1-vote (#75)
---
2.0.0/Dockerfile | 100 +++++++++++++++++++++++++++++++++++++++++++++
2.0.0/docker-entrypoint.sh | 28 +++++++++++++
2.0.0/local.ini | 8 ++++
2.0.0/vm.args | 28 +++++++++++++
4 files changed, 164 insertions(+)
diff --git a/2.0.0/Dockerfile b/2.0.0/Dockerfile
new file mode 100644
index 0000000..324ca5b
--- /dev/null
+++ b/2.0.0/Dockerfile
@@ -0,0 +1,100 @@
+# 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 \
+ 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.9.0/tini" \
+ && curl -o /usr/local/bin/tini.asc -fSL "https://github.com/krallin/tini/releases/download/v0.9.0/tini.asc" \
+ && gpg --verify /usr/local/bin/tini.asc \
+ && rm /usr/local/bin/tini.asc \
+ && chmod +x /usr/local/bin/tini
+
+ENV COUCHDB_VERSION 2.0.0
+
+# Download dev dependencies
+RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
+ apt-transport-https \
+ build-essential \
+ erlang-dev \
+ libcurl4-openssl-dev \
+ libicu-dev \
+ libmozjs185-dev \
+ && 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/2.0.0/apache-couchdb-$COUCHDB_VERSION.tar.gz -o couchdb.tar.gz \
+ && 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 \
+ binutils \
+ build-essential \
+ cpp \
+ erlang-dev \
+ git \
+ libicu-dev \
+ make \
+ nodejs \
+ perl \
+ && apt-get autoremove -y && apt-get clean \
+ && apt-get install -y libicu52 --no-install-recommends \
+ && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb*
+
+# Add configuration
+COPY local.ini /opt/couchdb/etc/
+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/local.d /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
new file mode 100755
index 0000000..d36ed8c
--- /dev/null
+++ b/2.0.0/docker-entrypoint.sh
@@ -0,0 +1,28 @@
+#!/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 775 /opt/couchdb/etc/*.d
+
+ exec gosu couchdb "$@"
+fi
+
+exec "$@"
diff --git a/2.0.0/local.ini b/2.0.0/local.ini
new file mode 100644
index 0000000..1aa633c
--- /dev/null
+++ b/2.0.0/local.ini
@@ -0,0 +1,8 @@
+; 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
new file mode 100644
index 0000000..0425756
--- /dev/null
+++ b/2.0.0/vm.args
@@ -0,0 +1,28 @@
+# 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>.
[couchdb-docker] 05/39: Add Dockerfile for CouchDB 2.0 production
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit efff00e2d3deee38a016b99ee03a956d5cbc6c72
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Thu Apr 28 22:09:17 2016 -0400
Add Dockerfile for CouchDB 2.0 production
Unlike the 2.0-dev build, which results in a fully-connected 3 node
cluster inside the container, this Dockerfile builds a minimal Erlang
release using reltool, installs that release into /opt/couchdb, and
runs just the one single Erlang VM. Orchestrating a cluster of these is
out of scope.
closes #52
closes #56
---
2.0-prod/Dockerfile | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
2.0-prod/couchdb.config | 21 +++++++++++++
2.0-prod/local.ini | 8 +++++
2.0-prod/vm.args | 28 +++++++++++++++++
4 files changed, 141 insertions(+)
diff --git a/2.0-prod/Dockerfile b/2.0-prod/Dockerfile
new file mode 100644
index 0000000..fb998c7
--- /dev/null
+++ b/2.0-prod/Dockerfile
@@ -0,0 +1,84 @@
+# 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
+
+ENV COUCHDB_VERSION master
+
+
+RUN groupadd -r couchdb && useradd -d /opt/couchdb -g couchdb couchdb
+
+# Download dependencies
+RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
+ apt-transport-https \
+ build-essential \
+ ca-certificates \
+ curl \
+ erlang-dev \
+ erlang-nox \
+ erlang-reltool \
+ git \
+ haproxy \
+ libcurl4-openssl-dev \
+ libicu-dev \
+ libmozjs185-dev \
+ openssl \
+ python \
+ && 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 and configure CouchDB source code
+ && cd /usr/src \
+ && git clone --depth 1 https://git-wip-us.apache.org/repos/asf/couchdb.git \
+ && cd couchdb \
+ && git checkout $COUCHDB_VERSION \
+ && ./configure \
+ --disable-docs \
+ --databasedir /var/lib/couchdb \
+ --viewindexdir /var/lib/couchdb \
+# Build the release and install into /opt
+ && make build \
+ && mv /usr/src/couchdb/rel/couchdb /opt/ \
+ && mkdir -p /var/lib/couchdb \
+ && chown -R couchdb:couchdb /opt/couchdb /var/lib/couchdb \
+# Cleanup build detritus
+ && apt-get purge -y \
+ binutils \
+ build-essential \
+ cpp \
+ erlang-dev \
+ git \
+ libicu-dev \
+ make \
+ nodejs \
+ perl \
+ && apt-get autoremove -y && apt-get clean \
+ && apt-get install -y libicu52 --no-install-recommends \
+ && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb
+
+# Now override some of the configuration
+COPY local.ini /opt/couchdb/etc/
+COPY vm.args /opt/couchdb/etc/
+RUN chown couchdb:couchdb /opt/couchdb/etc/*
+
+VOLUME ["/var/lib/couchdb"]
+USER couchdb
+EXPOSE 5984
+EXPOSE 4369
+EXPOSE 9100
+WORKDIR /opt/couchdb
+
+ENTRYPOINT ["/opt/couchdb/bin/couchdb"]
diff --git a/2.0-prod/couchdb.config b/2.0-prod/couchdb.config
new file mode 100644
index 0000000..7c0fa6b
--- /dev/null
+++ b/2.0-prod/couchdb.config
@@ -0,0 +1,21 @@
+% 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.
+%
+{package_author_name, "The Apache Software Foundation"}.
+{prefix, "."}.
+{data_dir, "/var/lib/couchdb"}.
+{view_index_dir, "/var/lib/couchdb"}.
+{log_file, ""}.
+{fauxton_root, "./share/www"}.
+{user, "couchdb"}.
+{cluster_port, 5984}.
+{backend_port, 5986}.
diff --git a/2.0-prod/local.ini b/2.0-prod/local.ini
new file mode 100644
index 0000000..1aa633c
--- /dev/null
+++ b/2.0-prod/local.ini
@@ -0,0 +1,8 @@
+; 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-prod/vm.args b/2.0-prod/vm.args
new file mode 100644
index 0000000..0425756
--- /dev/null
+++ b/2.0-prod/vm.args
@@ -0,0 +1,28 @@
+# 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>.
[couchdb-docker] 37/39: Update README.md with info about the
creation of system tables in 2.0 (#103)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 7c5c23ae186f19ad5070a22c662c488c7790cf13
Author: Duncan Kolba <du...@gmail.com>
AuthorDate: Fri Feb 3 17:12:41 2017 +0100
Update README.md with info about the creation of system tables in 2.0 (#103)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index e2d0e13..1def3c3 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ This is a developer preview of the upcoming CouchDB 2.0 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
-have to create `_global_changes`, `_metadata`, `_replicator` and `_users` manually.
+have to create `_global_changes`, `_metadata`, `_replicator` and `_users` manually (the admin interface has a "Setup" menu that does this for you).
The node will also start in [admin party mode](http://guide.couchdb.org/draft/security.html#party)!
```bash
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 28/39: Clarify which sections in README are for
1.6 and 2.0 (latest) (#90)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 09f767d5cd25735b677441a426e1828f67d2a4c9
Author: jrop <jr...@gmail.com>
AuthorDate: Tue Oct 25 02:50:01 2016 -0600
Clarify which sections in README are for 1.6 and 2.0 (latest) (#90)
Fixes #88
---
README.md | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index dd2e7f9..08c5f5c 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,29 @@ 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 (stable)
+## Run (2.0.0/latest)
+
+Available on the docker registry as [klaemo/couchdb:latest](https://index.docker.io/u/klaemo/couchdb/).
+This is a developer preview of the upcoming CouchDB 2.0 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
+have to create `_global_changes`, `_metadata`, `_replicator` and `_users` manually.
+The node will also start in [admin party mode](http://guide.couchdb.org/draft/security.html#party)!
+
+```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:2.0-single
+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
+18:54:48.780 [info] Application couch_plugins started on node nonode@nohost
+[...]
+```
+
+Once running, you can visit the new admin interface at `http://dockerhost:5984/_utils/`
+
+## Run (1.6.1)
Available as an official image on Docker Hub as [couchdb](https://hub.docker.com/_/couchdb/)
@@ -56,28 +78,6 @@ This build includes the `couchperuser` plugin.
[sudo] docker run -d -p 5984:5984 --name couchdb couchdb:1.6.1-couchperuser
```
-## Run (dev)
-
-Available on the docker registry as [klaemo/couchdb:latest](https://index.docker.io/u/klaemo/couchdb/).
-This is a developer preview of the upcoming CouchDB 2.0 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
-have to create `_global_changes`, `_metadata`, `_replicator` and `_users` manually.
-The node will also start in [admin party mode](http://guide.couchdb.org/draft/security.html#party)!
-
-```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:2.0-single
-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
-18:54:48.780 [info] Application couch_plugins started on node nonode@nohost
-[...]
-```
-
-Once running, you can visit the new admin interface at `http://dockerhost:5984/_utils/`
-
### In a developer cluster
Available on the docker registry as [klaemo/couchdb:2.0-dev](https://index.docker.io/u/klaemo/couchdb/).
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 01/39: 1.6: explicitly make entrypoint executable
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 5f2878ce475a76835d796d0093a10644ea6be8a5
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Fri May 6 17:22:48 2016 +0200
1.6: explicitly make entrypoint executable
should fix #19
---
1.6.1/Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/1.6.1/Dockerfile b/1.6.1/Dockerfile
index 5d4b63d..7b5f557 100644
--- a/1.6.1/Dockerfile
+++ b/1.6.1/Dockerfile
@@ -94,6 +94,7 @@ RUN buildDeps=' \
&& sed -e 's!/usr/local/var/log/couchdb/couch.log$!/dev/null!' -i /usr/local/etc/couchdb/default.ini
COPY ./docker-entrypoint.sh /
+RUN chmod +x /docker-entrypoint.sh
# Define mountable directories.
VOLUME ["/usr/local/var/lib/couchdb"]
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 32/39: fix 2.0-dev
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit f253c6513d9c056a6c4cc3faf85092d505f1edb6
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Sun Nov 13 12:04:26 2016 +0100
fix 2.0-dev
---
2.0-dev/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/2.0-dev/Dockerfile b/2.0-dev/Dockerfile
index 2c3b957..60f0c68 100644
--- a/2.0-dev/Dockerfile
+++ b/2.0-dev/Dockerfile
@@ -83,4 +83,5 @@ RUN chmod +x /usr/src/couchdb/dev/run && chown -R couchdb:couchdb /usr/src/couch
WORKDIR /usr/src/couchdb
EXPOSE 5984 4369 9100 15984 25984 35984 15986 25986 35986
-CMD ["tini", "--", "/usr/src/couchdb/dev/run", "--with-haproxy"]
+ENTRYPOINT ["tini", "--", "/usr/src/couchdb/dev/run"]
+CMD ["--with-haproxy"]
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 18/39: 2.0-dev: update to latest RC
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit f1637918eae2d6554a21e36a55d217365325f3b0
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Thu Sep 15 22:18:37 2016 +0200
2.0-dev: update to latest RC
---
2.0-dev/Dockerfile | 59 ++++++++++++++++++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 20 deletions(-)
diff --git a/2.0-dev/Dockerfile b/2.0-dev/Dockerfile
index 7653807..5f586e3 100644
--- a/2.0-dev/Dockerfile
+++ b/2.0-dev/Dockerfile
@@ -14,33 +14,54 @@ FROM debian:jessie
MAINTAINER Clemens Stolle klaemo@apache.org
-ENV COUCHDB_VERSION 2.0.0-RC4
+# Add CouchDB user account
+RUN groupadd -r couchdb && useradd -d /opt/couchdb -g couchdb couchdb
-RUN groupadd -r couchdb && useradd -d /usr/src/couchdb -g couchdb couchdb
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+ ca-certificates \
+ curl \
+ erlang-nox \
+ erlang-reltool \
+ libicu52 \
+ libmozjs185-1.0 \
+ haproxy \
+ python \
+ 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 6380DC428747F6C393FEACA59A84159D7001A4E5 \
+ && curl -o /usr/local/bin/tini -fSL "https://github.com/krallin/tini/releases/download/v0.9.0/tini" \
+ && curl -o /usr/local/bin/tini.asc -fSL "https://github.com/krallin/tini/releases/download/v0.9.0/tini.asc" \
+ && gpg --verify /usr/local/bin/tini.asc \
+ && rm /usr/local/bin/tini.asc \
+ && chmod +x /usr/local/bin/tini
+
+ENV COUCHDB_VERSION 2.0.0
-# download dependencies
+# Download dev dependencies
RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
apt-transport-https \
build-essential \
- ca-certificates \
- curl \
erlang-dev \
- erlang-nox \
- git \
- haproxy \
libcurl4-openssl-dev \
libicu-dev \
libmozjs185-dev \
- openssl \
- python \
&& 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 \
+ && apt-get update -y -qq \
+ && apt-get install -y nodejs \
&& npm install -g grunt-cli \
- && cd /usr/src && git clone https://git-wip-us.apache.org/repos/asf/couchdb.git \
- && cd couchdb && git checkout tags/$COUCHDB_VERSION \
- && cd /usr/src/couchdb && ./configure --disable-docs && make \
+ # Acquire CouchDB source code
+ && cd /usr/src && mkdir couchdb \
+ && curl -fSL https://dist.apache.org/repos/dist/dev/couchdb/source/2.0.0/rc.1/apache-couchdb-$COUCHDB_VERSION.tar.gz -o couchdb.tar.gz \
+ && tar -xzf couchdb.tar.gz -C couchdb --strip-components=1 \
+ && cd couchdb \
+ # Build the release and install
+ && ./configure --disable-docs \
+ && make release \
+ # Cleanup build detritus
&& apt-get purge -y \
binutils \
build-essential \
@@ -53,14 +74,12 @@ RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
perl \
&& apt-get autoremove -y && apt-get clean \
&& apt-get install -y libicu52 --no-install-recommends \
- && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules src/fauxton/node_modules src/**/.git .git
+ && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules
-# permissions
+# Setup directories and permissions
RUN chmod +x /usr/src/couchdb/dev/run && chown -R couchdb:couchdb /usr/src/couchdb
-USER couchdb
-EXPOSE 5984 15984 25984 35984 15986 25986 35986
WORKDIR /usr/src/couchdb
+EXPOSE 5984 4369 9100 15984 25984 35984 15986 25986 35986
-ENTRYPOINT ["/usr/src/couchdb/dev/run"]
-CMD ["--with-haproxy"]
+CMD ["tini", "--", "/usr/src/couchdb/dev/run", "--with-haproxy"]
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 11/39: update readme
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 287d340a6cfec2ce7e83b5b0bca716a45d37ac6e
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Thu Jul 21 22:43:16 2016 +0200
update readme
---
README.md | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index e798786..662160b 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,8 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
- `1`, `1.6`, `1.6.1`, `latest`: CouchDB 1.6.1
- `1-couchperuser`, `1.6-couchperuser`, `1.6.1-couchperuser`: CouchDB 1.6.1 with couchperuser plugin
-- `2.0-dev`: CouchDB 2.0 master (development version) with preconfigured dev cluster
+- `2.0-dev`: CouchDB 2.0 RC2 (development version) with preconfigured dev cluster
+- `2.0-rc2`: CouchDB 2.0 RC2 (development version) single node
- `2.0-dev-docs`: CouchDB 2.0 master (development version) with preconfigured dev cluster and documentation
- `2.0-single`: CouchDB 2.0 master (development version)
@@ -81,8 +82,8 @@ Once running, you can visit the new admin interface at `http://dockerhost:5984/_
### In a developer cluster
Available on the docker registry as [klaemo/couchdb:2.0-dev](https://index.docker.io/u/klaemo/couchdb/).
-This build demonstrates the CouchDB clustering features by creating a local
-cluster of a default three nodes inside the container, with a proxy in front.
+This build demonstrates the CouchDB clustering features by creating a local
+cluster of a default three nodes inside the container, with a proxy in front.
This is great for testing clustering in your local environment.
```bash
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 29/39: fix reference to -single image
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 62030f9593cef16f2dfe0a83263ff9d3a07d635a
Author: Clemens Stolle <kl...@fastmail.fm>
AuthorDate: Thu Nov 3 17:11:25 2016 +0100
fix reference to -single image
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 08c5f5c..1c7af6f 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,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:2.0-single
+[sudo] docker run -p 5984:5984 -v $(pwd):/opt/couchdb/data klaemo/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
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 38/39: 1.6.1: update tini
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit a8f7cd53a249fc667ce0750de0c4f0cfe54e17cb
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Wed Feb 8 18:51:01 2017 +0100
1.6.1: update tini
---
1.6.1/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/1.6.1/Dockerfile b/1.6.1/Dockerfile
index 7b5f557..1870795 100644
--- a/1.6.1/Dockerfile
+++ b/1.6.1/Dockerfile
@@ -36,8 +36,8 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364
&& 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.9.0/tini" \
- && curl -o /usr/local/bin/tini.asc -fSL "https://github.com/krallin/tini/releases/download/v0.9.0/tini.asc" \
+ && 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
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 13/39: fix travis build
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit f3997dba6675f256392d9f3fd480da4565629c21
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Thu Aug 4 15:20:42 2016 +0200
fix travis build
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5916c7b..1b53882 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-rc2 2.0-rc2
+ - docker build -t couchdb:2.0-rc3 2.0-rc3
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-rc2 && sleep 5 && curl http://localhost:5986
+ - docker run -d -p 5986:5984 couchdb:2.0-rc3 && sleep 5 && curl http://localhost:5986
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 17/39: add 2.0.0-rc1-vote 🎉 (#74)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 12e1f846004677c5d8d30640cba57d1fe6450d19
Author: Clemens Stolle <kl...@fastmail.fm>
AuthorDate: Thu Sep 15 21:33:17 2016 +0200
add 2.0.0-rc1-vote \U0001f389 (#74)
---
.travis.yml | 4 ++--
{2.0-rc4 => 2.0.0-rc1-vote}/Dockerfile | 4 ++--
{2.0-rc4 => 2.0.0-rc1-vote}/docker-entrypoint.sh | 0
{2.0-rc4 => 2.0.0-rc1-vote}/local.ini | 0
{2.0-rc4 => 2.0.0-rc1-vote}/vm.args | 0
5 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a322e09..ea3b05b 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-rc4 2.0-rc4
+ - docker build -t couchdb:2.0.0-rc1-vote 2.0.0-rc1-vote
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-rc4 && sleep 5 && curl http://localhost:5986
+ - docker run -d -p 5986:5984 couchdb:2.0.0-rc1-vote && sleep 5 && curl http://localhost:5986
diff --git a/2.0-rc4/Dockerfile b/2.0.0-rc1-vote/Dockerfile
similarity index 95%
rename from 2.0-rc4/Dockerfile
rename to 2.0.0-rc1-vote/Dockerfile
index 6065bc8..07d9522 100644
--- a/2.0-rc4/Dockerfile
+++ b/2.0.0-rc1-vote/Dockerfile
@@ -42,7 +42,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364
&& rm /usr/local/bin/tini.asc \
&& chmod +x /usr/local/bin/tini
-ENV COUCHDB_VERSION 2.0.0-RC4
+ENV COUCHDB_VERSION 2.0.0
# Download dev dependencies
RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
@@ -60,7 +60,7 @@ RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
&& npm install -g grunt-cli \
# Acquire CouchDB source code
&& cd /usr/src && mkdir couchdb \
- && curl -fSL https://couchdb-ci.s3-eu-west-1.amazonaws.com/release-candidate/apache-couchdb-$COUCHDB_VERSION.tar.gz -o couchdb.tar.gz \
+ && curl -fSL https://dist.apache.org/repos/dist/dev/couchdb/source/2.0.0/rc.1/apache-couchdb-$COUCHDB_VERSION.tar.gz -o couchdb.tar.gz \
&& tar -xzf couchdb.tar.gz -C couchdb --strip-components=1 \
&& cd couchdb \
# Build the release and install into /opt
diff --git a/2.0-rc4/docker-entrypoint.sh b/2.0.0-rc1-vote/docker-entrypoint.sh
similarity index 100%
rename from 2.0-rc4/docker-entrypoint.sh
rename to 2.0.0-rc1-vote/docker-entrypoint.sh
diff --git a/2.0-rc4/local.ini b/2.0.0-rc1-vote/local.ini
similarity index 100%
rename from 2.0-rc4/local.ini
rename to 2.0.0-rc1-vote/local.ini
diff --git a/2.0-rc4/vm.args b/2.0.0-rc1-vote/vm.args
similarity index 100%
rename from 2.0-rc4/vm.args
rename to 2.0.0-rc1-vote/vm.args
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 26/39: Added environment-based admin user/pass
(#81)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 1666c2ecfbdd3ebac9bbb3857a63495c3ca4cc36
Author: briansneddon <ch...@yahoo.com>
AuthorDate: Sat Oct 8 10:25:18 2016 -0500
Added environment-based admin user/pass (#81)
Added COUCHDB_USER and COUCHDB_PASS from the 1.6.1 version and adjusted the
file locations to reflect the new 2.0.0 locations
---
2.0.0/docker-entrypoint.sh | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/2.0.0/docker-entrypoint.sh b/2.0.0/docker-entrypoint.sh
index d36ed8c..62b14fa 100755
--- a/2.0.0/docker-entrypoint.sh
+++ b/2.0.0/docker-entrypoint.sh
@@ -22,6 +22,30 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
chmod 664 /opt/couchdb/etc/*.ini
chmod 775 /opt/couchdb/etc/*.d
+ 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/docker.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
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 21/39: update readme
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit d76577d1dbf15fd53229e13e41c5e657785e1c21
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Thu Sep 15 22:19:48 2016 +0200
update readme
---
README.md | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 825d1ee..9658b80 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,9 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
- `1`, `1.6`, `1.6.1`, `latest`: CouchDB 1.6.1
- `1-couchperuser`, `1.6-couchperuser`, `1.6.1-couchperuser`: CouchDB 1.6.1 with couchperuser plugin
-- `2.0-dev`: CouchDB 2.0 RC4 (development version) with preconfigured dev cluster
-- `2.0-rc4`: CouchDB 2.0 RC4 (development version) single node
+- `2.0-dev`: CouchDB 2.0 RC.1 (release vote) with preconfigured dev cluster
+- `latest`, 2.0.0-rc1-vote`: CouchDB 2.0 RC.1 (release vote) single node
- `2.0-dev-docs`: CouchDB 2.0 master (development version) with preconfigured dev cluster and documentation
-- `2.0-single`: CouchDB 2.0 master (development version)
## Features
@@ -27,13 +26,13 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
## Run (stable)
-Available as a trusted build on Docker Hub as [klaemo/couchdb](https://hub.docker.com/r/klaemo/couchdb/)
+Available as an official image on Docker Hub as [couchdb](https://hub.docker.com/_/couchdb/)
```bash
[sudo] docker pull klaemo/couchdb:latest
# expose it to the world on port 5984
-[sudo] docker run -d -p 5984:5984 --name couchdb klaemo/couchdb
+[sudo] docker run -d -p 5984:5984 --name couchdb couchdb
curl http://localhost:5984
```
@@ -42,7 +41,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 klaemo/couchdb
+[sudo] docker run -d -p 5984:5984 -v $(pwd):/usr/local/var/lib/couchdb --name couchdb couchdb
```
If you want to provide your own config, you can either mount a directory at `/usr/local/etc/couchdb`
@@ -54,12 +53,12 @@ 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 klaemo/couchdb:1.6.1-couchperuser
+[sudo] docker run -d -p 5984:5984 --name couchdb couchdb:1.6.1-couchperuser
```
## Run (dev)
-Available on the docker registry as [klaemo/couchdb:2.0-single](https://index.docker.io/u/klaemo/couchdb/).
+Available on the docker registry as [klaemo/couchdb:latest](https://index.docker.io/u/klaemo/couchdb/).
This is a developer preview of the upcoming CouchDB 2.0 release. A data volume
is exposed on `/opt/couchdb/data`, and the node's port is exposed on `5984`.
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 12/39: 2.0.0-RC3
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 14746157b39f073bd2f319b775fb6bfa4a10d179
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Thu Aug 4 15:13:39 2016 +0200
2.0.0-RC3
---
{2.0-rc2 => 2.0-rc3}/Dockerfile | 4 +---
{2.0-rc2 => 2.0-rc3}/local.ini | 0
{2.0-rc2 => 2.0-rc3}/vm.args | 0
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/2.0-rc2/Dockerfile b/2.0-rc3/Dockerfile
similarity index 95%
rename from 2.0-rc2/Dockerfile
rename to 2.0-rc3/Dockerfile
index b1adccb..972833d 100644
--- a/2.0-rc2/Dockerfile
+++ b/2.0-rc3/Dockerfile
@@ -28,9 +28,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
openssl \
&& rm -rf /var/lib/apt/lists/*
-# Pin to an arbitrary commit for a deterministic build
-# Once CouchDB has an actual 2.0 tag, we can use that
-ENV COUCHDB_VERSION 2.0.0-RC2
+ENV COUCHDB_VERSION 2.0.0-RC3
# Download dev dependencies
RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
diff --git a/2.0-rc2/local.ini b/2.0-rc3/local.ini
similarity index 100%
rename from 2.0-rc2/local.ini
rename to 2.0-rc3/local.ini
diff --git a/2.0-rc2/vm.args b/2.0-rc3/vm.args
similarity index 100%
rename from 2.0-rc2/vm.args
rename to 2.0-rc3/vm.args
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 14/39: 2.0: bump to RC4 (#69)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 5382c3bffef47e5b54a0b9e7d2b3c9952ca21ded
Author: Clemens Stolle <kl...@fastmail.fm>
AuthorDate: Wed Aug 17 22:05:18 2016 +0200
2.0: bump to RC4 (#69)
---
.travis.yml | 4 ++--
2.0-dev/Dockerfile | 2 +-
{2.0-rc3 => 2.0-rc4}/Dockerfile | 27 ++++++++++++++++++++-----
2.0-rc3/vm.args => 2.0-rc4/docker-entrypoint.sh | 24 +++++++++++-----------
{2.0-rc3 => 2.0-rc4}/local.ini | 0
{2.0-rc3 => 2.0-rc4}/vm.args | 0
6 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1b53882..a322e09 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-rc3 2.0-rc3
+ - docker build -t couchdb:2.0-rc4 2.0-rc4
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-rc3 && sleep 5 && curl http://localhost:5986
+ - docker run -d -p 5986:5984 couchdb:2.0-rc4 && sleep 5 && curl http://localhost:5986
diff --git a/2.0-dev/Dockerfile b/2.0-dev/Dockerfile
index 1d22720..3b12bb2 100644
--- a/2.0-dev/Dockerfile
+++ b/2.0-dev/Dockerfile
@@ -14,7 +14,7 @@ FROM debian:jessie
MAINTAINER Clemens Stolle klaemo@apache.org
-ENV COUCHDB_VERSION 2.0.0-RC2
+ENV COUCHDB_VERSION 2.0.0-RC4
RUN groupadd -r couchdb && useradd -d /usr/src/couchdb -g couchdb couchdb
diff --git a/2.0-rc3/Dockerfile b/2.0-rc4/Dockerfile
similarity index 66%
rename from 2.0-rc3/Dockerfile
rename to 2.0-rc4/Dockerfile
index 972833d..6065bc8 100644
--- a/2.0-rc3/Dockerfile
+++ b/2.0-rc4/Dockerfile
@@ -28,7 +28,21 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
openssl \
&& rm -rf /var/lib/apt/lists/*
-ENV COUCHDB_VERSION 2.0.0-RC3
+# 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.9.0/tini" \
+ && curl -o /usr/local/bin/tini.asc -fSL "https://github.com/krallin/tini/releases/download/v0.9.0/tini.asc" \
+ && gpg --verify /usr/local/bin/tini.asc \
+ && rm /usr/local/bin/tini.asc \
+ && chmod +x /usr/local/bin/tini
+
+ENV COUCHDB_VERSION 2.0.0-RC4
# Download dev dependencies
RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
@@ -72,13 +86,16 @@ RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
COPY local.ini /opt/couchdb/etc/
COPY vm.args /opt/couchdb/etc/
-# Setup directory permissions
-RUN mkdir -p /opt/couchdb/data \
+COPY ./docker-entrypoint.sh /
+
+# Setup directories and permissions
+RUN chmod +x /docker-entrypoint.sh \
+ && mkdir /opt/couchdb/data /opt/couchdb/etc/local.d /opt/couchdb/etc/default.d \
&& chown -R couchdb:couchdb /opt/couchdb/
-USER couchdb
WORKDIR /opt/couchdb
EXPOSE 5984 4369 9100
VOLUME ["/opt/couchdb/data"]
-ENTRYPOINT ["/opt/couchdb/bin/couchdb"]
+ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
+CMD ["/opt/couchdb/bin/couchdb"]
diff --git a/2.0-rc3/vm.args b/2.0-rc4/docker-entrypoint.sh
old mode 100644
new mode 100755
similarity index 56%
copy from 2.0-rc3/vm.args
copy to 2.0-rc4/docker-entrypoint.sh
index 0425756..d36ed8c
--- a/2.0-rc3/vm.args
+++ b/2.0-rc4/docker-entrypoint.sh
@@ -1,3 +1,4 @@
+#!/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
@@ -10,19 +11,18 @@
# 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
+set -e
-# Tell kernel and SASL not to log anything
--kernel error_logger silent
--sasl sasl_error_logger false
+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
-# Use kernel poll functionality if supported by emulator
-+K true
+ chmod -R 0770 /opt/couchdb/data
-# Start a pool of asynchronous IO threads
-+A 16
+ chmod 664 /opt/couchdb/etc/*.ini
+ chmod 775 /opt/couchdb/etc/*.d
-# Comment this line out to enable the interactive Erlang shell on startup
-+Bd -noinput
+ exec gosu couchdb "$@"
+fi
+
+exec "$@"
diff --git a/2.0-rc3/local.ini b/2.0-rc4/local.ini
similarity index 100%
rename from 2.0-rc3/local.ini
rename to 2.0-rc4/local.ini
diff --git a/2.0-rc3/vm.args b/2.0-rc4/vm.args
similarity index 100%
rename from 2.0-rc3/vm.args
rename to 2.0-rc4/vm.args
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 10/39: 2.0-dev: pin to RC2
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 8c9f74856fe148d92a17a522ba7d80e7615cf93e
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Thu Jul 21 22:39:10 2016 +0200
2.0-dev: pin to RC2
---
2.0-dev/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/2.0-dev/Dockerfile b/2.0-dev/Dockerfile
index bb51d5e..1d22720 100644
--- a/2.0-dev/Dockerfile
+++ b/2.0-dev/Dockerfile
@@ -14,7 +14,7 @@ FROM debian:jessie
MAINTAINER Clemens Stolle klaemo@apache.org
-ENV COUCHDB_VERSION master
+ENV COUCHDB_VERSION 2.0.0-RC2
RUN groupadd -r couchdb && useradd -d /usr/src/couchdb -g couchdb couchdb
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 03/39: improve admin-party detection (#53)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 29ed69965ed616a9d0df9a6ffa081773d86c78bc
Author: Clemens Stolle <kl...@fastmail.fm>
AuthorDate: Mon May 9 19:54:09 2016 +0200
improve admin-party detection (#53)
---
1.6.1/docker-entrypoint.sh | 42 ++++++++++++++++++------------------------
1 file changed, 18 insertions(+), 24 deletions(-)
diff --git a/1.6.1/docker-entrypoint.sh b/1.6.1/docker-entrypoint.sh
index 763d285..180d075 100755
--- a/1.6.1/docker-entrypoint.sh
+++ b/1.6.1/docker-entrypoint.sh
@@ -14,17 +14,30 @@
set -e
if [ "$1" = 'couchdb' ]; then
+ # we need to set the permissions here because docker mounts volumes as root
+ chown -R couchdb:couchdb \
+ /usr/local/var/lib/couchdb \
+ /usr/local/var/log/couchdb \
+ /usr/local/var/run/couchdb \
+ /usr/local/etc/couchdb
+
+ chmod -R 0770 \
+ /usr/local/var/lib/couchdb \
+ /usr/local/var/log/couchdb \
+ /usr/local/var/run/couchdb \
+ /usr/local/etc/couchdb
+
+ chmod 664 /usr/local/etc/couchdb/*.ini
+ chmod 775 /usr/local/etc/couchdb/*.d
if [ "$COUCHDB_USER" ] && [ "$COUCHDB_PASSWORD" ]; then
# Create admin
printf "[admins]\n$COUCHDB_USER = $COUCHDB_PASSWORD\n" > /usr/local/etc/couchdb/local.d/docker.ini
+ chown couchdb:couchdb /usr/local/etc/couchdb/local.d/docker.ini
fi
- # Start CouchDB
- couchdb -b > /dev/null 2>&1
- while ! curl -s 127.0.0.1:5984 > /dev/null; do sleep 1; done
-
- if [ "$(curl -s 127.0.0.1:5984/_config/admins)" == "{}" ]; then
+ # if we don't find an [admins] section followed by a non-comment, display a warning
+ if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /usr/local/etc/couchdb; then
# The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN'
****************************************************
@@ -40,25 +53,6 @@ if [ "$1" = 'couchdb' ]; then
EOWARN
fi
- # Stop CouchDB
- couchdb -d > /dev/null 2>&1
-
- # we need to set the permissions here because docker mounts volumes as root
- chown -R couchdb:couchdb \
- /usr/local/var/lib/couchdb \
- /usr/local/var/log/couchdb \
- /usr/local/var/run/couchdb \
- /usr/local/etc/couchdb
-
- chmod -R 0770 \
- /usr/local/var/lib/couchdb \
- /usr/local/var/log/couchdb \
- /usr/local/var/run/couchdb \
- /usr/local/etc/couchdb
-
- chmod 664 /usr/local/etc/couchdb/*.ini
- chmod 775 /usr/local/etc/couchdb/*.d
-
exec gosu couchdb "$@"
fi
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 31/39: remove old images
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit e65ab0998a4303edd2d2a5b241d37cad32f49add
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Sun Nov 13 10:20:43 2016 +0100
remove old images
---
2.0.0-rc1-vote/Dockerfile | 101 ------------------------------------
2.0.0-rc1-vote/docker-entrypoint.sh | 28 ----------
2.0.0-rc1-vote/local.ini | 8 ---
2.0.0-rc1-vote/vm.args | 28 ----------
README.md | 2 +-
5 files changed, 1 insertion(+), 166 deletions(-)
diff --git a/2.0.0-rc1-vote/Dockerfile b/2.0.0-rc1-vote/Dockerfile
deleted file mode 100644
index 94136fc..0000000
--- a/2.0.0-rc1-vote/Dockerfile
+++ /dev/null
@@ -1,101 +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 \
- haproxy \
- erlang-nox \
- erlang-reltool \
- 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.9.0/tini" \
- && curl -o /usr/local/bin/tini.asc -fSL "https://github.com/krallin/tini/releases/download/v0.9.0/tini.asc" \
- && gpg --verify /usr/local/bin/tini.asc \
- && rm /usr/local/bin/tini.asc \
- && chmod +x /usr/local/bin/tini
-
-ENV COUCHDB_VERSION 2.0.0
-
-# Download dev dependencies
-RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
- apt-transport-https \
- build-essential \
- erlang-dev \
- libcurl4-openssl-dev \
- libicu-dev \
- libmozjs185-dev \
- && 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/dev/couchdb/source/2.0.0/rc.1/apache-couchdb-$COUCHDB_VERSION.tar.gz -o couchdb.tar.gz \
- && 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 \
- binutils \
- build-essential \
- cpp \
- erlang-dev \
- git \
- libicu-dev \
- make \
- nodejs \
- perl \
- && apt-get autoremove -y && apt-get clean \
- && apt-get install -y libicu52 --no-install-recommends \
- && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb*
-
-# Add configuration
-COPY local.ini /opt/couchdb/etc/
-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/local.d /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-rc1-vote/docker-entrypoint.sh b/2.0.0-rc1-vote/docker-entrypoint.sh
deleted file mode 100755
index d36ed8c..0000000
--- a/2.0.0-rc1-vote/docker-entrypoint.sh
+++ /dev/null
@@ -1,28 +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 775 /opt/couchdb/etc/*.d
-
- exec gosu couchdb "$@"
-fi
-
-exec "$@"
diff --git a/2.0.0-rc1-vote/local.ini b/2.0.0-rc1-vote/local.ini
deleted file mode 100644
index 1aa633c..0000000
--- a/2.0.0-rc1-vote/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-rc1-vote/vm.args b/2.0.0-rc1-vote/vm.args
deleted file mode 100644
index 0425756..0000000
--- a/2.0.0-rc1-vote/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
diff --git a/README.md b/README.md
index 1c7af6f..d0fc0d6 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Once running, you can visit the new admin interface at `http://dockerhost:5984/_
Available as an official image on Docker Hub as [couchdb](https://hub.docker.com/_/couchdb/)
```bash
-[sudo] docker pull klaemo/couchdb:latest
+[sudo] docker pull couchdb:latest
# expose it to the world on port 5984
[sudo] docker run -d -p 5984:5984 --name couchdb couchdb
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 39/39: 2.0.0: update tini and add gpg verification
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit c648704c95274990892b30356db755ecd1539a36
Author: klaemo <kl...@fastmail.fm>
AuthorDate: Wed Feb 8 18:51:30 2017 +0100
2.0.0: update tini and add gpg verification
---
2.0.0/Dockerfile | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/2.0.0/Dockerfile b/2.0.0/Dockerfile
index c74f90f..73d5083 100644
--- a/2.0.0/Dockerfile
+++ b/2.0.0/Dockerfile
@@ -20,9 +20,9 @@ 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 \
- haproxy \
erlang-nox \
erlang-reltool \
+ haproxy \
libicu52 \
libmozjs185-1.0 \
openssl \
@@ -36,22 +36,42 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364
&& 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.9.0/tini" \
- && curl -o /usr/local/bin/tini.asc -fSL "https://github.com/krallin/tini/releases/download/v0.9.0/tini.asc" \
+ && 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 apt-get update -y -qq && apt-get install -y --no-install-recommends \
+RUN buildDeps=' \
apt-transport-https \
- build-essential \
+ 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 \
@@ -60,7 +80,9 @@ RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
&& 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/2.0.0/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 -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
@@ -68,18 +90,7 @@ RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
&& make release \
&& mv /usr/src/couchdb/rel/couchdb /opt/ \
# Cleanup build detritus
- && apt-get purge -y \
- binutils \
- build-essential \
- cpp \
- erlang-dev \
- git \
- libicu-dev \
- make \
- nodejs \
- perl \
- && apt-get autoremove -y && apt-get clean \
- && apt-get install -y libicu52 --no-install-recommends \
+ && apt-get purge -y --auto-remove $buildDeps \
&& rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb*
# Add configuration
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-docker] 35/39: Add COUCHDB_HTTP_PORT/BIND_ADDRESS to 1.6.1
(#92)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 0efab517f0276df584ccbfcdab62f4b8c1651032
Author: Jean-Christophe Hoelt <ho...@fovea.cc>
AuthorDate: Sun Nov 13 13:28:06 2016 +0200
Add COUCHDB_HTTP_PORT/BIND_ADDRESS to 1.6.1 (#92)
---
1.6.1/docker-entrypoint.sh | 3 +++
README.md | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/1.6.1/docker-entrypoint.sh b/1.6.1/docker-entrypoint.sh
index d18a33a..c1c9f56 100755
--- a/1.6.1/docker-entrypoint.sh
+++ b/1.6.1/docker-entrypoint.sh
@@ -36,6 +36,9 @@ if [ "$1" = 'couchdb' ]; then
chown couchdb:couchdb /usr/local/etc/couchdb/local.d/docker.ini
fi
+ printf "[httpd]\nport = %s\nbind_address = %s\n" ${COUCHDB_HTTP_PORT:=5984} ${COUCHDB_HTTP_BIND_ADDRESS:=0.0.0.0} > /usr/local/etc/couchdb/local.d/bind_address.ini
+ chown couchdb:couchdb /usr/local/etc/couchdb/local.d/bind_address.ini
+
# if we don't find an [admins] section followed by a non-comment, display a warning
if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /usr/local/etc/couchdb; then
# The - option suppresses leading tabs but *not* spaces. :)
diff --git a/README.md b/README.md
index adbd17a..b1ee837 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,11 @@ curl http://localhost:5984
If you want to provide your own config, you can either mount a directory at `/usr/local/etc/couchdb`
or extend the image and `COPY` your `config.ini` (see [Build you own](#build-your-own)).
+If you need (or want) to run couchdb in `net=host` mode, you can customize the port and bind address using environment variables:
+
+ - `COUCHDB_HTTP_BIND_ADDRESS` (default: `0.0.0.0`)
+ - `COUCHDB_HTTP_PORT` (default: `5984`)
+
### with couchperuser plugin
This build includes the `couchperuser` plugin.
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.