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 42732662fc9c9d84d9c833e56391780902ea3ae3
Author: Tom Vincent <[email protected]>
AuthorDate: Thu Nov 3 16:49:14 2016 +0000

    Relax CouchDB v2 entry point ini (#91)
    
    `admins` could be set in any ini file, so allow it.
---
 2.0.0/docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/2.0.0/docker-entrypoint.sh b/2.0.0/docker-entrypoint.sh
index 62b14fa..9441a03 100755
--- a/2.0.0/docker-entrypoint.sh
+++ b/2.0.0/docker-entrypoint.sh
@@ -29,7 +29,7 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
        fi
 
        # if we don't find an [admins] section followed by a non-comment, 
display a warning
-       if ! grep -Pzoqr '\[admins\]\n[^;]\w+' 
/opt/couchdb/etc/local.d/docker.ini; then
+       if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /opt/couchdb/etc/local.d/*.ini; 
then
                # The - option suppresses leading tabs but *not* spaces. :)
                cat >&2 <<-'EOWARN'
                        ****************************************************

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to