[FAB-12023] CouchDB image config problem

The CouchDB docker image starts slowly due to directory permissions being applied during container startup. This change moves the grants and permissions to the CouchDB image creation. This change also reverts the CouchDB version from 2.2.0 to 2.1.1 Change-Id: I081f2d238a1002a31bc18cd39277704631e69d8b Signed-off-by: Chris Elder <[email protected]>
hyperledger-archives · Oct 8, 2018 · ec6800a · glmars · Mar 5, 2019 · ec6800a
1 parent 997ecdc
commit ec6800a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/images/couchdb/Dockerfile.in b/images/couchdb/Dockerfile.in
@@ -87,7 +87,7 @@ RUN set -xe \
  done; \
  done
 
-ENV COUCHDB_VERSION 2.2.0
+ENV COUCHDB_VERSION 2.1.1
 
 # Download dev dependencies
 RUN buildDeps=' \
@@ -126,7 +126,12 @@ COPY payload/20-fabric-default.ini /opt/couchdb/etc/default.d/
 COPY payload/docker-entrypoint.sh /
 
 # Setup directories and permissions
-RUN chown -R couchdb:couchdb /opt/couchdb/etc/default.d/ /opt/couchdb/etc/vm.args
+RUN chmod +x /docker-entrypoint.sh \
+ && chown -R couchdb:couchdb /opt/couchdb/etc/default.d/ /opt/couchdb/etc/vm.args \
+ && chmod -R 0770 /opt/couchdb/data \
+ && chmod 664 /opt/couchdb/etc/*.ini \
+ && chmod 664 /opt/couchdb/etc/default.d/*.ini \
+ && chmod 775 /opt/couchdb/etc/*.d
 
 WORKDIR /opt/couchdb
 EXPOSE 5984 4369 9100

diff --git a/images/couchdb/docker-entrypoint.sh b/images/couchdb/docker-entrypoint.sh
@@ -25,14 +25,6 @@ if [ "$1" = 'couchdb' ]; then
 fi
 
 if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
- # we need to set the permissions here because docker mounts volumes as root
- chown -R couchdb:couchdb /opt/couchdb
-
- chmod -R 0770 /opt/couchdb/data
-
- chmod 664 /opt/couchdb/etc/*.ini
- chmod 664 /opt/couchdb/etc/default.d/*.ini
- chmod 775 /opt/couchdb/etc/*.d
 
  if [ ! -z "$NODENAME" ] && ! grep "couchdb@" /opt/couchdb/etc/vm.args; then
  echo "-name couchdb@$NODENAME" >> /opt/couchdb/etc/vm.args