From 9d32b5b7a78ced4e3488aa07b68ec71ab5894a10 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 7 Dec 2023 17:31:27 +0000 Subject: [PATCH] Add another special case for the docker-compose variant of our CouchDB image. --- hosting/couchdb/runner.sh | 7 +++++++ packages/cli/package.json | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hosting/couchdb/runner.sh b/hosting/couchdb/runner.sh index b576c886c2..19c612a17e 100644 --- a/hosting/couchdb/runner.sh +++ b/hosting/couchdb/runner.sh @@ -30,6 +30,13 @@ elif [[ "${TARGETBUILD}" = "single" ]]; then # mount, so we use that for all persistent data. sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini +elif [[ "${TARGETBUILD}" = "docker-compose" ]]; then + # We remove the database_dir and view_index_dir settings from the local.ini + # in docker-compose because it will default to /opt/couchdb/data which is what + # our docker-compose was using prior to us switching to using our own CouchDB + # image. + sed -i "s#^database_dir.*\$##g" /opt/couchdb/etc/local.ini + sed -i "s#^view_index_dir.*\$##g" /opt/couchdb/etc/local.ini elif [[ -n $KUBERNETES_SERVICE_HOST ]]; then # In Kubernetes the directory /opt/couchdb/data has a persistent volume # mount for storing database data. diff --git a/packages/cli/package.json b/packages/cli/package.json index 49384538ef..fc3044fb14 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -15,7 +15,8 @@ "pkg": "pkg . --out-path build --no-bytecode --public --public-packages \"*\" -C GZip", "build": "yarn prebuild && yarn rename && yarn tsc && yarn pkg && yarn postbuild", "check:types": "tsc -p tsconfig.json --noEmit --paths null", - "postbuild": "rm -rf prebuilds 2> /dev/null" + "postbuild": "rm -rf prebuilds 2> /dev/null", + "start": "ts-node ./src/index.ts" }, "pkg": { "targets": [