Compose.yml tidying:
- Docker secrets - Postgres data volume - Rename n8n → app - Set WEBHOOK_URL
This commit is contained in:
parent
ff0ca97ce0
commit
3f78484334
73
compose.yml
73
compose.yml
|
@ -3,45 +3,30 @@
|
||||||
version: '3.8'
|
version: '3.8'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
db:
|
app:
|
||||||
image: postgres:11
|
|
||||||
restart: always
|
|
||||||
networks:
|
|
||||||
- internal_network
|
|
||||||
environment:
|
|
||||||
- POSTGRES_USER=root
|
|
||||||
- POSTGRES_PASSWORD=test
|
|
||||||
# - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
|
||||||
- POSTGRES_DB=n8n
|
|
||||||
# - POSTGRES_NON_ROOT_USER
|
|
||||||
# volumes:
|
|
||||||
# - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
|
|
||||||
|
|
||||||
n8n:
|
|
||||||
image: n8nio/n8n
|
image: n8nio/n8n
|
||||||
restart: always
|
|
||||||
environment:
|
environment:
|
||||||
- DB_TYPE=postgresdb
|
- DB_TYPE=postgresdb
|
||||||
- DB_POSTGRESDB_HOST=db
|
- DB_POSTGRESDB_HOST=${STACK_NAME}_db
|
||||||
- DB_POSTGRESDB_PORT=5432
|
- DB_POSTGRESDB_PORT=5432
|
||||||
- DB_POSTGRESDB_DATABASE=n8n #${POSTGRES_DB}
|
- DB_POSTGRESDB_DATABASE=n8n
|
||||||
- DB_POSTGRESDB_USER=root #${POSTGRES_NON_ROOT_USER}
|
- DB_POSTGRESDB_USER=root
|
||||||
- DB_POSTGRESDB_PASSWORD=test
|
- DB_POSTGRESDB_PASSWORD_FILE=/run/secrets/db_password
|
||||||
# - DB_POSTGRESDB_PASSWORD_FILE=/run/secrets/db_password
|
|
||||||
- N8N_BASIC_AUTH_ACTIVE=true
|
- N8N_BASIC_AUTH_ACTIVE=true
|
||||||
- N8N_BASIC_AUTH_USER
|
- N8N_BASIC_AUTH_USER
|
||||||
- N8N_BASIC_AUTH_PASSWORD
|
- N8N_BASIC_AUTH_PASSWORD
|
||||||
# - N8N_BASIC_AUTH_PASSWORD_FILE=/run/secrets/admin_password
|
- N8N_BASIC_AUTH_PASSWORD_FILE=/run/secrets/admin_password
|
||||||
ports:
|
- WEBHOOK_URL=https:/${DOMAIN}
|
||||||
- 5678:5678
|
depends_on:
|
||||||
|
- db
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
- internal_network
|
- internal_network
|
||||||
volumes:
|
volumes:
|
||||||
- n8n:/home/node/.n8n
|
- n8n:/home/node/.n8n
|
||||||
# Wait 5 seconds to start n8n to make sure that PostgreSQL is ready
|
secrets:
|
||||||
# when n8n tries to connect to it
|
- db_password
|
||||||
command: /bin/sh -c "sleep 5; n8n start"
|
- admin_password
|
||||||
deploy:
|
deploy:
|
||||||
update_config:
|
update_config:
|
||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
|
@ -57,22 +42,40 @@ services:
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
|
|
||||||
# secrets:
|
db:
|
||||||
|
image: postgres:11
|
||||||
|
networks:
|
||||||
|
- internal_network
|
||||||
|
environment:
|
||||||
|
- POSTGRES_USER=root
|
||||||
|
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
- POSTGRES_DB=n8n
|
||||||
|
# - POSTGRES_NON_ROOT_USER
|
||||||
|
secrets:
|
||||||
|
- db_password
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "pg_isready", "-U", "root", "-d", "n8n"]
|
||||||
|
volumes:
|
||||||
|
- 'postgresql_data:/var/lib/postgresql/data'
|
||||||
|
# - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
|
||||||
|
|
||||||
|
|
||||||
|
secrets:
|
||||||
# db_non_root_password:
|
# db_non_root_password:
|
||||||
# external: true
|
# external: true
|
||||||
# name: ${STACK_NAME}_db_non_root_password_${SECRET_DB_NON_ROOT_PASSWORD_VERSION}
|
# name: ${STACK_NAME}_db_non_root_password_${SECRET_DB_NON_ROOT_PASSWORD_VERSION}
|
||||||
# db_password:
|
db_password:
|
||||||
# external: true
|
external: true
|
||||||
# name: ${STACKNAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||||
# admin_password:
|
admin_password:
|
||||||
# external: true
|
external: true
|
||||||
# name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
|
name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
n8n:
|
n8n:
|
||||||
|
postgresql_data:
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
internal_network:
|
internal_network:
|
||||||
internal: true
|
|
||||||
|
|
Loading…
Reference in New Issue