Merge branch 'main' into feature/Credential

# Conflicts:
#	README.md
#	docker/.env.example
#	packages/components/nodes/documentloaders/Notion/NotionDB.ts
#	packages/components/nodes/memory/DynamoDb/DynamoDb.ts
#	packages/components/nodes/memory/MotorheadMemory/MotorheadMemory.ts
#	packages/components/nodes/memory/ZepMemory/ZepMemory.ts
#	packages/components/package.json
#	packages/components/src/utils.ts
#	packages/server/.env.example
#	packages/server/README.md
#	packages/server/marketplaces/chatflows/Conversational Retrieval QA Chain.json
#	packages/server/src/ChildProcess.ts
#	packages/server/src/DataSource.ts
#	packages/server/src/commands/start.ts
#	packages/server/src/index.ts
#	packages/server/src/utils/index.ts
#	packages/server/src/utils/logger.ts

docker/.env.example

@@ -1,11 +1,22 @@
 PORT=3000
 PASSPHRASE=MYPASSPHRASE # Passphrase used to create encryption key
+DATABASE_PATH=/root/.flowise
+APIKEY_PATH=/root/.flowise
+SECRETKEY_PATH=/root/.flowise
+LOG_PATH=/root/.flowise/logs
+
+# DATABASE_TYPE=postgres
+# DATABASE_PORT=""
+# DATABASE_HOST=""
+# DATABASE_NAME="flowise"
+# DATABASE_USER=""
+# DATABASE_PASSWORD=""
+# OVERRIDE_DATABASE=true
+
 # FLOWISE_USERNAME=user
 # FLOWISE_PASSWORD=1234
 # DEBUG=true
-# DATABASE_PATH=/your/database/path/.flowise
-# APIKEY_PATH=/your/api/key/path
-# SECRETKEY_PATH=/your/secret/key/path
-# LOG_PATH=/your/log/path
 # LOG_LEVEL=debug (error | warn | info | verbose | debug)
 # EXECUTION_MODE=main (child | main)
+# TOOL_FUNCTION_BUILTIN_DEP=crypto,fs
+# TOOL_FUNCTION_EXTERNAL_DEP=moment,lodash

docker/README.md

@@ -9,7 +9,7 @@ Starts Flowise from [DockerHub Image](https://hub.docker.com/repository/docker/f
 3. Open [http://localhost:3000](http://localhost:3000)
 4. You can bring the containers down by `docker-compose stop`
 
-## With Authrorization
+## 🔒 Authentication
 
 1. Create `.env` file and specify the `PORT`, `FLOWISE_USERNAME`, and `FLOWISE_PASSWORD` (refer to `.env.example`)
 2. Pass `FLOWISE_USERNAME` and `FLOWISE_PASSWORD` to the `docker-compose.yml` file:
@@ -22,3 +22,14 @@ Starts Flowise from [DockerHub Image](https://hub.docker.com/repository/docker/f
 3. `docker-compose up -d`
 4. Open [http://localhost:3000](http://localhost:3000)
 5. You can bring the containers down by `docker-compose stop`
+
+## 🌱 Env Variables
+
+If you like to persist your data (flows, logs, apikeys, credentials), set these variables in the `.env` file inside `docker` folder:
+
+-   DATABASE_PATH=/root/.flowise
+-   APIKEY_PATH=/root/.flowise
+-   LOG_PATH=/root/.flowise/logs
+-   SECRETKEY_PATH=/root/.flowise
+
+Flowise also support different environment variables to configure your instance. Read [more](https://docs.flowiseai.com/environment-variables)

docker/docker-compose.yml

@@ -9,13 +9,13 @@ services:
             - PASSPHRASE=${PASSPHRASE}
             - FLOWISE_USERNAME=${FLOWISE_USERNAME}
             - FLOWISE_PASSWORD=${FLOWISE_PASSWORD}
+            - DEBUG=${DEBUG}
             - DATABASE_PATH=${DATABASE_PATH}
             - APIKEY_PATH=${APIKEY_PATH}
             - SECRETKEY_PATH=${SECRETKEY_PATH}
             - LOG_LEVEL=${LOG_LEVEL}
             - LOG_PATH=${LOG_PATH}
             - EXECUTION_MODE=${EXECUTION_MODE}
-            - DEBUG=${DEBUG}
         ports:
             - '${PORT}:${PORT}'
         volumes: