You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kl...@apache.org on 2016/01/25 17:17:21 UTC

[1/3] couchdb-docker git commit: 1.6: merge RUN instructions

Repository: couchdb-docker
Updated Branches:
  refs/heads/master 9270c8894 -> bbdd8a932


1.6: merge RUN instructions


Project: http://git-wip-us.apache.org/repos/asf/couchdb-docker/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-docker/commit/34a7ca27
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-docker/tree/34a7ca27
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-docker/diff/34a7ca27

Branch: refs/heads/master
Commit: 34a7ca27f2e30f8fc549198922a218f89834de8f
Parents: 9270c88
Author: klaemo <kl...@fastmail.fm>
Authored: Mon Jan 25 14:24:23 2016 +0100
Committer: klaemo <kl...@fastmail.fm>
Committed: Mon Jan 25 14:24:23 2016 +0100

----------------------------------------------------------------------
 1.6.1/Dockerfile | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/34a7ca27/1.6.1/Dockerfile
----------------------------------------------------------------------
diff --git a/1.6.1/Dockerfile b/1.6.1/Dockerfile
index 8f80a24..9b2b900 100644
--- a/1.6.1/Dockerfile
+++ b/1.6.1/Dockerfile
@@ -56,25 +56,22 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
  && apt-get install -y libicu52 --no-install-recommends \
  && rm -rf /var/lib/apt/lists/* /usr/src/couchdb /couchdb.tar.gz* /KEYS
 
-# grab gosu for easy step-down from root
+# grab gosu for easy step-down from root, set correct permissions, expose couchdb to the outside
+# and disable logging to disk
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
   && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \
   && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \
   && gpg --verify /usr/local/bin/gosu.asc \
   && rm /usr/local/bin/gosu.asc \
-  && chmod +x /usr/local/bin/gosu
-
-# permissions
-RUN chown -R couchdb:couchdb \
+  && chmod +x /usr/local/bin/gosu \
+  && chown -R couchdb:couchdb \
     /usr/local/lib/couchdb /usr/local/etc/couchdb \
     /usr/local/var/lib/couchdb /usr/local/var/log/couchdb /usr/local/var/run/couchdb \
   && chmod -R g+rw \
     /usr/local/lib/couchdb /usr/local/etc/couchdb \
     /usr/local/var/lib/couchdb /usr/local/var/log/couchdb /usr/local/var/run/couchdb \
-  && mkdir -p /var/lib/couchdb
-
-# Expose to the outside
-RUN sed -e 's/^bind_address = .*$/bind_address = 0.0.0.0/' -i /usr/local/etc/couchdb/default.ini
+  && mkdir -p /var/lib/couchdb \
+  && sed -e 's/^bind_address = .*$/bind_address = 0.0.0.0/' -i /usr/local/etc/couchdb/default.ini
 
 COPY ./docker-entrypoint.sh /
 


[3/3] couchdb-docker git commit: 1.6: update gosu to latest version

Posted by kl...@apache.org.
1.6: update gosu to latest version


Project: http://git-wip-us.apache.org/repos/asf/couchdb-docker/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-docker/commit/bbdd8a93
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-docker/tree/bbdd8a93
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-docker/diff/bbdd8a93

Branch: refs/heads/master
Commit: bbdd8a932e338cbe25ee6cf2c4569d1dbfa93699
Parents: 1ca9290
Author: klaemo <kl...@fastmail.fm>
Authored: Mon Jan 25 14:25:24 2016 +0100
Committer: klaemo <kl...@fastmail.fm>
Committed: Mon Jan 25 17:16:44 2016 +0100

----------------------------------------------------------------------
 1.6.1/Dockerfile           | 4 ++--
 1.6.1/docker-entrypoint.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/bbdd8a93/1.6.1/Dockerfile
----------------------------------------------------------------------
diff --git a/1.6.1/Dockerfile b/1.6.1/Dockerfile
index 91bc6ab..66a00b4 100644
--- a/1.6.1/Dockerfile
+++ b/1.6.1/Dockerfile
@@ -59,8 +59,8 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
 # grab gosu for easy step-down from root, set correct permissions, expose couchdb to the outside
 # and disable logging to disk
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-  && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \
-  && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \
+  && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture)" \
+  && curl -o /usr/local/bin/gosu.asc -SL "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 \

http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/bbdd8a93/1.6.1/docker-entrypoint.sh
----------------------------------------------------------------------
diff --git a/1.6.1/docker-entrypoint.sh b/1.6.1/docker-entrypoint.sh
index 01828ff..ba4dac3 100755
--- a/1.6.1/docker-entrypoint.sh
+++ b/1.6.1/docker-entrypoint.sh
@@ -29,7 +29,7 @@ if [ "$1" = 'couchdb' ]; then
 
   chmod 664 /usr/local/etc/couchdb/*.ini
   chmod 775 /usr/local/etc/couchdb/*.d
-  HOME=/var/lib/couchdb exec gosu couchdb "$@"
+  exec gosu couchdb "$@"
 fi
 
 exec "$@"


[2/3] couchdb-docker git commit: 1.6: only log to stdout

Posted by kl...@apache.org.
1.6: only log to stdout


Project: http://git-wip-us.apache.org/repos/asf/couchdb-docker/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-docker/commit/1ca92900
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-docker/tree/1ca92900
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-docker/diff/1ca92900

Branch: refs/heads/master
Commit: 1ca92900210c8523c0a5d9ff0e10817846f05a99
Parents: 34a7ca2
Author: klaemo <kl...@fastmail.fm>
Authored: Mon Jan 25 14:24:47 2016 +0100
Committer: klaemo <kl...@fastmail.fm>
Committed: Mon Jan 25 17:16:44 2016 +0100

----------------------------------------------------------------------
 1.6.1/Dockerfile | 5 +++--
 README.md        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/1ca92900/1.6.1/Dockerfile
----------------------------------------------------------------------
diff --git a/1.6.1/Dockerfile b/1.6.1/Dockerfile
index 9b2b900..91bc6ab 100644
--- a/1.6.1/Dockerfile
+++ b/1.6.1/Dockerfile
@@ -71,12 +71,13 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4
     /usr/local/lib/couchdb /usr/local/etc/couchdb \
     /usr/local/var/lib/couchdb /usr/local/var/log/couchdb /usr/local/var/run/couchdb \
   && mkdir -p /var/lib/couchdb \
-  && sed -e 's/^bind_address = .*$/bind_address = 0.0.0.0/' -i /usr/local/etc/couchdb/default.ini
+  && sed -e 's/^bind_address = .*$/bind_address = 0.0.0.0/' -i /usr/local/etc/couchdb/default.ini \
+  && sed -e 's/\/usr\/local\/var\/log\/couchdb\/couch.log$/\/dev\/null/' -i /usr/local/etc/couchdb/default.ini
 
 COPY ./docker-entrypoint.sh /
 
 # Define mountable directories.
-VOLUME ["/usr/local/var/log/couchdb", "/usr/local/var/lib/couchdb", "/usr/local/etc/couchdb"]
+VOLUME ["/usr/local/var/lib/couchdb"]
 
 EXPOSE 5984
 WORKDIR /var/lib/couchdb

http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/1ca92900/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 373d6c5..ac741ec 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
 * built on top of the solid and small `debian:jessie` base image
 * exposes CouchDB on port `5984` of the container
 * runs everything as user `couchdb` (security ftw!)
-* docker volumes for data, logs and config
+* docker volume for data
 
 ## Run (stable)