[couchdb-docker] 36/39: Dockerfile puts local.ini in /opt/couchdb/etc/, not local.d. (#99)

[ga...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git

commit cb252b2a9cade1a850f640b92321304d207b5891
Author: Victor Heng <ba...@gmail.com>
AuthorDate: Fri Jan 27 13:28:56 2017 -0800

    Dockerfile puts local.ini in /opt/couchdb/etc/, not local.d. (#99)
---
 2.0.0/Dockerfile           | 4 ++--
 2.0.0/docker-entrypoint.sh | 1 +
 README.md                  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/2.0.0/Dockerfile b/2.0.0/Dockerfile
index 3f76b8b..c74f90f 100644
--- a/2.0.0/Dockerfile
+++ b/2.0.0/Dockerfile
@@ -83,14 +83,14 @@ RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \
  && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb*
 
 # Add configuration
-COPY local.ini /opt/couchdb/etc/
+COPY local.ini /opt/couchdb/etc/local.d/
 COPY vm.args /opt/couchdb/etc/
 
 COPY ./docker-entrypoint.sh /
 
 # Setup directories and permissions
 RUN chmod +x /docker-entrypoint.sh \
- && mkdir /opt/couchdb/data /opt/couchdb/etc/local.d /opt/couchdb/etc/default.d \
+ && mkdir /opt/couchdb/data /opt/couchdb/etc/default.d \
  && chown -R couchdb:couchdb /opt/couchdb/
 
 WORKDIR /opt/couchdb
diff --git a/2.0.0/docker-entrypoint.sh b/2.0.0/docker-entrypoint.sh
index 33da092..2ff1715 100755
--- a/2.0.0/docker-entrypoint.sh
+++ b/2.0.0/docker-entrypoint.sh
@@ -20,6 +20,7 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
 	chmod -R 0770 /opt/couchdb/data
 
 	chmod 664 /opt/couchdb/etc/*.ini
+	chmod 664 /opt/couchdb/etc/local.d/*.ini
 	chmod 775 /opt/couchdb/etc/*.d
 
 	if [ ! -z "$NODENAME" ] && ! grep "couchdb@" /opt/couchdb/etc/vm.args; then
diff --git a/README.md b/README.md
index b1ee837..e2d0e13 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ Example Dockerfile:
 ```
 FROM klaemo/couchdb:latest
 
-COPY local.ini /usr/local/etc/couchdb/
+COPY local.ini /usr/local/etc/couchdb/local.d/
 ```
 
 and then build and run

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.