include latest updates

Author: welshDoug

2.3.1-ubi7/Dockerfile

@@ -94,20 +94,15 @@ RUN set -xe; \
 # but we keep them as 755 and 644 for consistency with CouchDB defaults and the dockerfile_entrypoint.
     find /opt/couchdb/etc -type d ! -perm 0755 -exec chmod -f 0775 '{}' +; \
     find /opt/couchdb/etc -type f ! -perm 0644 -exec chmod -f 0664 '{}' +; \
-# only local.d needs to be writable for the docker_entrypoint.sh
-    chmod -f 0777 /opt/couchdb/etc/local.d; \
 # Setup directories and permissions for data.
     chmod 777 /opt/couchdb/data
 
 # Add the License
 COPY licenses /licenses
 
 # Add configuration
-USER couchdb
-COPY resources/10-docker-default.ini /opt/couchdb/etc/default.d/
-COPY resources/vm.args /opt/couchdb/etc/
-USER root
-
+COPY --chown=couchdb:0 resources/10-docker-default.ini /opt/couchdb/etc/default.d/
+COPY --chown=couchdb:0 resources/vm.args /opt/couchdb/etc/
 COPY resources/docker-entrypoint.sh /usr/local/bin
 COPY resources/run /etc/service/couchdb/
 

2.3.1-ubi7/resources/docker-entrypoint.sh

@@ -103,14 +103,14 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
 			#!/bin/sh
 			export HOME=/opt/couchdb
 			exec 2>&1
-			exec chpst -u couchdb $@
+			exec chpst -u couchdb env ERL_FLAGS="$ERL_FLAGS" $@
 		EOF
 	else
 		cat > /etc/service/couchdb/run <<-EOF
 			#!/bin/sh
 			export HOME=/opt/couchdb
 			exec 2>&1
-			exec chpst $@
+			exec chpst env ERL_FLAGS="$ERL_FLAGS" $@
 		EOF
 	fi