From 36e4d9a2a2031e2ad00b06360c81b8f2b4897b8a Mon Sep 17 00:00:00 2001 From: "Yao (Alwyn) Pan" Date: Wed, 2 Oct 2019 10:27:26 +1000 Subject: [PATCH] Fix couchdb backup endpoint; Set ENABLE_ZABBIX to FALSE by default --- Dockerfile | 3 ++- install/etc/s6/services/10-db-backup/run | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ccea201..7a038f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ COPY --from=mongo-packages / /usr/src/apk ### Set Environment Variables ENV ENABLE_CRON=FALSE \ - ENABLE_SMTP=FALSE + ENABLE_SMTP=FALSE \ + ENABLE_ZABBIX=FALSE ### Dependencies RUN set -ex && \ diff --git a/install/etc/s6/services/10-db-backup/run b/install/etc/s6/services/10-db-backup/run index 9fe3ca0..527180b 100755 --- a/install/etc/s6/services/10-db-backup/run +++ b/install/etc/s6/services/10-db-backup/run @@ -97,7 +97,7 @@ fi ### Functions function backup_couch() { TARGET=couch_${DBNAME}_${DBHOST}_${now}.txt - curl -X GET http://${DBHOST}:${DBPORT}/${DBNAME}/ all docs? include docs=true >${TMPDIR}/${TARGET} + curl -X GET http://${DBHOST}:${DBPORT}/${DBNAME}/_all_docs?include_docs=true >${TMPDIR}/${TARGET} generate_md5 compression move_backup