feat(service): update n8n worker to v2
- update n8n and n8n worker to v2 - add external n8n task-runners - change all env variables to v2 naming - improve some defaults - formatting, ordering and spacing
This commit is contained in:
parent
b0b9c59fd5
commit
60427b695b
1 changed files with 38 additions and 6 deletions
|
|
@ -7,14 +7,15 @@
|
|||
|
||||
services:
|
||||
n8n:
|
||||
image: docker.n8n.io/n8nio/n8n:1.123.9
|
||||
image: n8nio/n8n:2.1.5
|
||||
environment:
|
||||
- SERVICE_URL_N8N_5678
|
||||
- N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
|
||||
- WEBHOOK_URL=${SERVICE_URL_N8N}
|
||||
- N8N_HOST=${SERVICE_URL_N8N}
|
||||
- GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-Europe/Berlin}
|
||||
- TZ=${TZ:-Europe/Berlin}
|
||||
- N8N_PROTOCOL=${N8N_PROTOCOL:-https}
|
||||
- GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-UTC}
|
||||
- TZ=${TZ:-UTC}
|
||||
- DB_TYPE=postgresdb
|
||||
- DB_POSTGRESDB_DATABASE=${POSTGRES_DB:-n8n}
|
||||
- DB_POSTGRESDB_HOST=postgresql
|
||||
|
|
@ -27,11 +28,18 @@ services:
|
|||
- QUEUE_HEALTH_CHECK_ACTIVE=true
|
||||
- N8N_ENCRYPTION_KEY=${SERVICE_PASSWORD_ENCRYPTION}
|
||||
- N8N_RUNNERS_ENABLED=true
|
||||
- N8N_RUNNERS_MODE=external
|
||||
- N8N_RUNNERS_BROKER_LISTEN_ADDRESS=${N8N_RUNNERS_BROKER_LISTEN_ADDRESS:-0.0.0.0}
|
||||
- N8N_RUNNERS_BROKER_PORT=${N8N_RUNNERS_BROKER_PORT:-5679}
|
||||
- N8N_RUNNERS_AUTH_TOKEN=$SERVICE_PASSWORD_N8N
|
||||
- N8N_NATIVE_PYTHON_RUNNER=${N8N_NATIVE_PYTHON_RUNNER:-true}
|
||||
- N8N_RUNNERS_MAX_CONCURRENCY=${N8N_RUNNERS_MAX_CONCURRENCY:-5}
|
||||
- OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS=true
|
||||
- N8N_BLOCK_ENV_ACCESS_IN_NODE=${N8N_BLOCK_ENV_ACCESS_IN_NODE:-true}
|
||||
- N8N_GIT_NODE_DISABLE_BARE_REPOS=${N8N_GIT_NODE_DISABLE_BARE_REPOS:-true}
|
||||
- N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=${N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS:-true}
|
||||
- N8N_PROXY_HOPS=${N8N_PROXY_HOPS:-1}
|
||||
- N8N_SKIP_AUTH_ON_OAUTH_CALLBACK=${N8N_SKIP_AUTH_ON_OAUTH_CALLBACK:-false}
|
||||
volumes:
|
||||
- n8n-data:/home/node/.n8n
|
||||
depends_on:
|
||||
|
|
@ -46,11 +54,11 @@ services:
|
|||
retries: 10
|
||||
|
||||
n8n-worker:
|
||||
image: docker.n8n.io/n8nio/n8n:1.123.9
|
||||
image: n8nio/n8n:2.1.5
|
||||
command: worker
|
||||
environment:
|
||||
- GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-Europe/Berlin}
|
||||
- TZ=${TZ:-Europe/Berlin}
|
||||
- GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-UTC}
|
||||
- TZ=${TZ:-UTC}
|
||||
- DB_TYPE=postgresdb
|
||||
- DB_POSTGRESDB_DATABASE=${POSTGRES_DB:-n8n}
|
||||
- DB_POSTGRESDB_HOST=postgresql
|
||||
|
|
@ -63,10 +71,17 @@ services:
|
|||
- QUEUE_HEALTH_CHECK_ACTIVE=true
|
||||
- N8N_ENCRYPTION_KEY=${SERVICE_PASSWORD_ENCRYPTION}
|
||||
- N8N_RUNNERS_ENABLED=true
|
||||
- N8N_RUNNERS_MODE=external
|
||||
- N8N_RUNNERS_BROKER_LISTEN_ADDRESS=${N8N_RUNNERS_BROKER_LISTEN_ADDRESS:-0.0.0.0}
|
||||
- N8N_RUNNERS_BROKER_PORT=${N8N_RUNNERS_BROKER_PORT:-5679}
|
||||
- N8N_RUNNERS_AUTH_TOKEN=$SERVICE_PASSWORD_N8N
|
||||
- N8N_NATIVE_PYTHON_RUNNER=${N8N_NATIVE_PYTHON_RUNNER:-true}
|
||||
- N8N_RUNNERS_MAX_CONCURRENCY=${N8N_RUNNERS_MAX_CONCURRENCY:-5}
|
||||
- N8N_BLOCK_ENV_ACCESS_IN_NODE=${N8N_BLOCK_ENV_ACCESS_IN_NODE:-true}
|
||||
- N8N_GIT_NODE_DISABLE_BARE_REPOS=${N8N_GIT_NODE_DISABLE_BARE_REPOS:-true}
|
||||
- N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=${N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS:-true}
|
||||
- N8N_PROXY_HOPS=${N8N_PROXY_HOPS:-1}
|
||||
- N8N_SKIP_AUTH_ON_OAUTH_CALLBACK=${N8N_SKIP_AUTH_ON_OAUTH_CALLBACK:-false}
|
||||
volumes:
|
||||
- n8n-data:/home/node/.n8n
|
||||
healthcheck:
|
||||
|
|
@ -105,3 +120,20 @@ services:
|
|||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
|
||||
task-runners:
|
||||
image: n8nio/runners:2.1.5
|
||||
environment:
|
||||
- N8N_RUNNERS_TASK_BROKER_URI=${N8N_RUNNERS_TASK_BROKER_URI:-http://n8n:5679}
|
||||
- N8N_RUNNERS_AUTH_TOKEN=$SERVICE_PASSWORD_N8N
|
||||
- N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT=${N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT:-15}
|
||||
- N8N_RUNNERS_MAX_CONCURRENCY=${N8N_RUNNERS_MAX_CONCURRENCY:-5}
|
||||
depends_on:
|
||||
- n8n
|
||||
healthcheck:
|
||||
test:
|
||||
- CMD-SHELL
|
||||
- 'wget -qO- http://127.0.0.1:5680/'
|
||||
interval: 5s
|
||||
timeout: 20s
|
||||
retries: 10
|
||||
|
|
|
|||
Loading…
Reference in a new issue