couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kla...@apache.org
Subject couchdb-docker git commit: 1.6.1: use tini for signal handling
Date Wed, 27 Jan 2016 18:35:46 GMT
Repository: couchdb-docker
Updated Branches:
  refs/heads/master 2f7514b7e -> ab6b0b5f7


1.6.1: use tini for signal handling

closes klaemo/docker-couchdb#45


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

Branch: refs/heads/master
Commit: ab6b0b5f71ad1d84cdf378e3248685421195caff
Parents: 2f7514b
Author: klaemo <klaemo@fastmail.fm>
Authored: Wed Jan 27 14:06:46 2016 +0100
Committer: klaemo <klaemo@fastmail.fm>
Committed: Wed Jan 27 19:35:21 2016 +0100

----------------------------------------------------------------------
 1.6.1/Dockerfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/ab6b0b5f/1.6.1/Dockerfile
----------------------------------------------------------------------
diff --git a/1.6.1/Dockerfile b/1.6.1/Dockerfile
index 3706c67..5d4b63d 100644
--- a/1.6.1/Dockerfile
+++ b/1.6.1/Dockerfile
@@ -28,14 +28,19 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends
\
     libnspr4-0d \
   && rm -rf /var/lib/apt/lists/*
 
-# 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
\
+# 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
+  && 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
 
 # https://www.apache.org/dist/couchdb/KEYS
 ENV GPG_KEYS \
@@ -55,7 +60,8 @@ RUN set -xe \
 
 ENV COUCHDB_VERSION 1.6.1
 
-# download dependencies, compile and install couchdb
+# download dependencies, compile and install couchdb,
+# set correct permissions, expose couchdb to the outside and disable logging to disk
 RUN buildDeps=' \
     gcc \
     g++ \
@@ -95,5 +101,5 @@ VOLUME ["/usr/local/var/lib/couchdb"]
 EXPOSE 5984
 WORKDIR /var/lib/couchdb
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
 CMD ["couchdb"]


Mime
View raw message