You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2017/09/24 05:38:32 UTC
[couchdb-docker] branch official-images-feedback created (now
3f854af)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch official-images-feedback
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git.
at 3f854af Update with feedback from @yosifkit
This branch includes the following new commits:
new 3f854af Update with feedback from @yosifkit
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].
[couchdb-docker] 01/01: Update with feedback from @yosifkit
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch official-images-feedback
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 3f854af0edcb497153f60eb00bc1013793b09f55
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Sun Sep 24 01:38:06 2017 -0400
Update with feedback from @yosifkit
---
1.6.1-couchperuser/Dockerfile | 2 +-
1.6.1/Dockerfile | 8 ++++----
2.1.0/Dockerfile | 15 ++++++++-------
2.1.0/bashrc | 1 +
dev/Dockerfile | 2 +-
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/1.6.1-couchperuser/Dockerfile b/1.6.1-couchperuser/Dockerfile
index 3055750..9436a38 100644
--- a/1.6.1-couchperuser/Dockerfile
+++ b/1.6.1-couchperuser/Dockerfile
@@ -12,7 +12,7 @@
FROM couchdb:1.6.1
-MAINTAINER Clemens Stolle klaemo@apache.org
+MAINTAINER CouchDB Developers dev@couchdb.apache.org
ENV COUCHPERUSER_SHA 5d28db3272eea9619d4391b33aae6030f0319ecc54aa2a2f2b6c6a8d448f03f2
RUN apt-get update && apt-get install -y rebar make \
diff --git a/1.6.1/Dockerfile b/1.6.1/Dockerfile
index 1870795..f7169a2 100644
--- a/1.6.1/Dockerfile
+++ b/1.6.1/Dockerfile
@@ -12,7 +12,7 @@
FROM debian:jessie
-MAINTAINER Clemens Stolle klaemo@apache.org
+MAINTAINER CouchDB Developers dev@couchdb.apache.org
# Install instructions from https://cwiki.apache.org/confluence/display/COUCHDB/Debian
@@ -32,13 +32,13 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
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 \
+ && gpg --batch --verify /usr/local/bin/gosu.asc \
&& rm /usr/local/bin/gosu.asc \
&& chmod +x /usr/local/bin/gosu \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \
&& curl -o /usr/local/bin/tini -fSL "https://github.com/krallin/tini/releases/download/v0.14.0/tini" \
&& curl -o /usr/local/bin/tini.asc -fSL "https://github.com/krallin/tini/releases/download/v0.14.0/tini.asc" \
- && gpg --verify /usr/local/bin/tini.asc \
+ && gpg --batch --verify /usr/local/bin/tini.asc \
&& rm /usr/local/bin/tini.asc \
&& chmod +x /usr/local/bin/tini
@@ -75,7 +75,7 @@ RUN buildDeps=' \
&& apt-get update && apt-get install -y --no-install-recommends $buildDeps \
&& curl -fSL http://apache.osuosl.org/couchdb/source/$COUCHDB_VERSION/apache-couchdb-$COUCHDB_VERSION.tar.gz -o couchdb.tar.gz \
&& curl -fSL https://www.apache.org/dist/couchdb/source/$COUCHDB_VERSION/apache-couchdb-$COUCHDB_VERSION.tar.gz.asc -o couchdb.tar.gz.asc \
- && gpg --verify couchdb.tar.gz.asc \
+ && gpg --batch --verify couchdb.tar.gz.asc \
&& mkdir -p /usr/src/couchdb \
&& tar -xzf couchdb.tar.gz -C /usr/src/couchdb --strip-components=1 \
&& cd /usr/src/couchdb \
diff --git a/2.1.0/Dockerfile b/2.1.0/Dockerfile
index 43c7762..8f870d6 100644
--- a/2.1.0/Dockerfile
+++ b/2.1.0/Dockerfile
@@ -12,7 +12,7 @@
FROM debian:jessie
-MAINTAINER Clemens Stolle klaemo@apache.org
+MAINTAINER CouchDB Developers dev@couchdb.apache.org
# Add CouchDB user account
RUN groupadd -r couchdb && useradd -d /opt/couchdb -g couchdb couchdb
@@ -32,13 +32,13 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
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 \
+ && gpg --batch --verify /usr/local/bin/gosu.asc \
&& rm /usr/local/bin/gosu.asc \
&& chmod +x /usr/local/bin/gosu \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \
&& curl -o /usr/local/bin/tini -fSL "https://github.com/krallin/tini/releases/download/v0.14.0/tini" \
&& curl -o /usr/local/bin/tini.asc -fSL "https://github.com/krallin/tini/releases/download/v0.14.0/tini.asc" \
- && gpg --verify /usr/local/bin/tini.asc \
+ && gpg --batch --verify /usr/local/bin/tini.asc \
&& rm /usr/local/bin/tini.asc \
&& chmod +x /usr/local/bin/tini
@@ -78,7 +78,7 @@ RUN buildDeps=' \
&& cd /usr/src && mkdir couchdb \
&& curl -fSL https://dist.apache.org/repos/dist/release/couchdb/source/$COUCHDB_VERSION/apache-couchdb-$COUCHDB_VERSION.tar.gz -o couchdb.tar.gz \
&& curl -fSL https://dist.apache.org/repos/dist/release/couchdb/source/$COUCHDB_VERSION/apache-couchdb-$COUCHDB_VERSION.tar.gz.asc -o couchdb.tar.gz.asc \
- && gpg --verify couchdb.tar.gz.asc \
+ && gpg --batch --verify couchdb.tar.gz.asc \
&& tar -xzf couchdb.tar.gz -C couchdb --strip-components=1 \
&& cd couchdb \
# Build the release and install into /opt
@@ -88,17 +88,18 @@ RUN buildDeps=' \
# Cleanup build detritus
&& apt-get purge -y --auto-remove $buildDeps \
&& rm -rf /var/lib/apt/lists/* /usr/src/couchdb*
+ && mkdir /opt/couchdb/data
+ && chown -R couchdb:couchdb /opt/couchdb
# Add configuration
COPY local.ini /opt/couchdb/etc/local.d/
COPY vm.args /opt/couchdb/etc/
+COPY bashrc /opt/couchdb/.bashrc
COPY ./docker-entrypoint.sh /
# Setup directories and permissions
-RUN chmod +x /docker-entrypoint.sh \
- && mkdir /opt/couchdb/data \
- && chown -R couchdb:couchdb /opt/couchdb/
+RUN chown -R couchdb:couchdb /opt/couchdb/.bashrc /opt/couchdb/etc/local.d/ /opt/couchdb/etc/vm.args
WORKDIR /opt/couchdb
EXPOSE 5984 5986 4369 9100-9200
diff --git a/2.1.0/bashrc b/2.1.0/bashrc
new file mode 100644
index 0000000..90297af
--- /dev/null
+++ b/2.1.0/bashrc
@@ -0,0 +1 @@
+PATH="$HOME/bin:$PATH"
diff --git a/dev/Dockerfile b/dev/Dockerfile
index 61b0ffb..5dcf2a7 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -12,7 +12,7 @@
FROM debian:jessie
-MAINTAINER Clemens Stolle klaemo@apache.org
+MAINTAINER CouchDB Developers dev@couchdb.apache.org
ENV COUCHDB_VERSION master
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.