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/26 12:50:07 UTC
[couchdb-docker] branch master updated: (#11) Fix docker image
naming
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
The following commit(s) were added to refs/heads/master by this push:
new f1cec35 (#11) Fix docker image naming
f1cec35 is described below
commit f1cec35a1886a4019ccf88799312f463e24ff55c
Author: garren smith <ga...@gmail.com>
AuthorDate: Wed Apr 26 14:50:05 2017 +0200
(#11) Fix docker image naming
`1`, `1.6`, `1.6.1`: CouchDB 1.6.1
- `1-couchperuser`, `1.6-couchperuser`, `1.6.1-couchperuser`: CouchDB
1.6.1 with couchperuser plugin
- `latest`, `2.0.0`: CouchDB 2.0 single node
- `dev`: CouchDB 2.0 master (development version) with preconfigured dev
cluster and documentation
---
2.0-dev/Dockerfile | 87 ----------------------------------------
README.md | 17 ++++----
{2.0-dev-docs => dev}/Dockerfile | 0
3 files changed, 8 insertions(+), 96 deletions(-)
diff --git a/2.0-dev/Dockerfile b/2.0-dev/Dockerfile
deleted file mode 100644
index 60f0c68..0000000
--- a/2.0-dev/Dockerfile
+++ /dev/null
@@ -1,87 +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 \
- 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 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
- && ./configure --disable-docs \
- && make release \
- # 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
-
-# Setup directories and permissions
-RUN chmod +x /usr/src/couchdb/dev/run && chown -R couchdb:couchdb /usr/src/couchdb
-
-WORKDIR /usr/src/couchdb
-EXPOSE 5984 4369 9100 15984 25984 35984 15986 25986 35986
-
-ENTRYPOINT ["tini", "--", "/usr/src/couchdb/dev/run"]
-CMD ["--with-haproxy"]
diff --git a/README.md b/README.md
index 1def3c3..46a746f 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,8 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
- `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
-- `2.0-dev-docs`: CouchDB 2.0 master (development version) with preconfigured dev cluster and documentation
+- `dev`: CouchDB 2.0 master (development version) with preconfigured dev cluster and documentation
## Features
@@ -27,7 +26,7 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
## 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
+This is a build of the 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
@@ -86,14 +85,14 @@ This build includes the `couchperuser` plugin.
### In a developer cluster
-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: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
-[sudo] docker run -it -p 5984:5984 klaemo/couchdb:2.0-dev
+[sudo] docker run -it -p 5984:5984 klaemo/couchdb:dev
[ * ] Setup environment ... ok
[ * ] Ensure CouchDB is built ... ok
@@ -117,7 +116,7 @@ Time to hack! ...
...but you can pass arguments to the binary
```bash
-docker run -it klaemo/couchdb:2.0-dev --admin=foo:bar
+docker run -it klaemo/couchdb:dev --admin=foo:bar
```
**Note:** This will overwrite the default `--with-haproxy` flag. The cluster **won't** be exposed on
port `5984` anymore. The individual nodes listen on `15984`, `25984`, ...`x5984`. If you wish to expose
@@ -126,13 +125,13 @@ the cluster on `5984`, pass `--with-haproxy` explicitly.
Examples:
```bash
# display the available options of the couchdb startup script
-docker run --rm klaemo/couchdb:2.0-dev --help
+docker run --rm klaemo/couchdb:dev --help
# Enable admin party \U0001f389 and expose the cluster on port 5984
-docker run -it -p 5984:5984 klaemo/couchdb:2.0-dev --with-admin-party-please --with-haproxy
+docker run -it -p 5984:5984 klaemo/couchdb:dev --with-admin-party-please --with-haproxy
# Start two nodes (without proxy) exposed on port 15984 and 25984
-docker run -it -p 15984:15984 -p 25984:25984 klaemo/couchdb:2.0-dev -n 2
+docker run -it -p 15984:15984 -p 25984:25984 klaemo/couchdb:dev -n 2
```
## Build your own
diff --git a/2.0-dev-docs/Dockerfile b/dev/Dockerfile
similarity index 100%
rename from 2.0-dev-docs/Dockerfile
rename to dev/Dockerfile
--
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].