diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index fc8d4d8b2d..b89bf8ffd4 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -80,7 +80,11 @@ ln -s ${DATA_DIR}/.env /worker/.env # make these directories in runner, incase of mount mkdir -p ${DATA_DIR}/minio chown -R couchdb:couchdb ${DATA_DIR}/couch -redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & +if [[ -n "${REDIS_PASSWORD}" ]]; then + redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & +else + redis-server > /dev/stdout 2>&1 & +fi /bbcouch-runner.sh & # only start minio if use s3 isn't passed diff --git a/lerna.json b/lerna.json index caa665a0f2..c9b38f1031 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "2.30.1", + "version": "2.30.2", "npmClient": "yarn", "packages": [ "packages/*", diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index 8db7816a9c..b4b4fdea5d 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -304,7 +304,7 @@ export const getSignedUploadURL = async function (ctx: Ctx) { try { const s3 = new AWS.S3({ region: awsRegion, - endpoint: datasource?.config?.endpoint as string, + endpoint: datasource?.config?.endpoint || undefined, accessKeyId: datasource?.config?.accessKeyId as string, secretAccessKey: datasource?.config?.secretAccessKey as string, apiVersion: "2006-03-01",