couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kla...@apache.org
Subject [1/3] couchdb-docker git commit: 1.6: merge RUN instructions
Date Mon, 25 Jan 2016 16:17:21 GMT
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 <klaemo@fastmail.fm>
Authored: Mon Jan 25 14:24:23 2016 +0100
Committer: klaemo <klaemo@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 /
 


Mime
View raw message