couchdb-commits mailing list archives

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


Mime
View raw message