Compare commits

...

3 Commits

Author SHA1 Message Date
3wc
64fdb022be chore: publish 0.3.0+0.204.0 release 2022-11-25 21:55:25 -08:00
3wc
c2ba0d9cca Add backups 2022-11-25 21:53:43 -08:00
3wc
cd23e770e0 Split out basic auth 2022-11-19 20:02:46 -08:00
3 changed files with 32 additions and 14 deletions

View File

@ -6,13 +6,15 @@ DOMAIN=n8n.example.com
#EXTRA_DOMAINS=', `www.n8n.example.com`'
LETS_ENCRYPT_ENV=production
# Only required if you're not using SSO
N8N_BASIC_AUTH_USER=username
SECRET_DB_PASSWORD_VERSION=v1
SECRET_ADMIN_PASSWORD_VERSION=v1
COMPOSE_FILE="compose.yml"
# SSO using traefik-forward-auth
#COMPOSE_FILE="$COMPOSE_FILE:compose.sso.yml"
# Basic auth
#COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml"
#N8N_BASIC_AUTH_ACTIVE=true
#N8N_BASIC_AUTH_USER=username
#SECRET_ADMIN_PASSWORD_VERSION=v1

15
compose.basicauth.yml Normal file
View File

@ -0,0 +1,15 @@
version: '3.8'
services:
app:
environment:
- N8N_BASIC_AUTH_ACTIVE=true
- N8N_BASIC_AUTH_USER
- N8N_BASIC_AUTH_PASSWORD_FILE=/run/secrets/admin_password
secrets:
- admin_password
secrets:
admin_password:
external: true
name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}

View File

@ -4,7 +4,7 @@ version: '3.8'
services:
app:
image: n8nio/n8n:0.162.0
image: n8nio/n8n:0.204.0
environment:
- DB_TYPE=postgresdb
- DB_POSTGRESDB_HOST=${STACK_NAME}_db
@ -12,9 +12,7 @@ services:
- DB_POSTGRESDB_DATABASE=n8n
- DB_POSTGRESDB_USER=root
- DB_POSTGRESDB_PASSWORD_FILE=/run/secrets/db_password
- N8N_BASIC_AUTH_ACTIVE=true
- N8N_BASIC_AUTH_USER
- N8N_BASIC_AUTH_PASSWORD_FILE=/run/secrets/admin_password
- N8N_BASIC_AUTH_ACTIVE=false
- WEBHOOK_URL=https://${DOMAIN}
- NODE_FUNCTION_ALLOW_EXTERNAL=moment
depends_on:
@ -26,7 +24,6 @@ services:
- n8n:/home/node/.n8n
secrets:
- db_password
- admin_password
deploy:
update_config:
failure_action: rollback
@ -41,7 +38,9 @@ services:
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
- "coop-cloud.${STACK_NAME}.version=0.2.0+0.162.0"
- "coop-cloud.${STACK_NAME}.version=0.3.0+0.204.0"
- "backupbot.backup=true"
- "backupbot.backup.path=/home/node/.n8n"
db:
image: postgres:11
@ -58,7 +57,12 @@ services:
volumes:
- 'postgresql_data:/var/lib/postgresql/data'
# - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
deploy:
labels:
backupbot.backup: "true"
backupbot.backup.pre-hook: "bash -c 'PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup.sql'"
backupbot.backup.post-hook: "rm -rf /tmp/backup.sql"
backupbot.backup.path: "/tmp/backup.sql"
secrets:
# db_non_root_password:
@ -67,9 +71,6 @@ secrets:
db_password:
external: true
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
admin_password:
external: true
name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
volumes:
n8n: