orztv commited on
Commit
ad5bc33
·
1 Parent(s): 6d79ed1
Files changed (3) hide show
  1. .env +0 -10
  2. Dockerfile +1 -0
  3. run.sh +16 -1
.env DELETED
@@ -1,10 +0,0 @@
1
- # PostgreSQL 配置
2
- POSTGRES_USER=n8n
3
- POSTGRES_PASSWORD=your_secure_password
4
- POSTGRES_DB=n8n
5
-
6
- # N8N 配置
7
- N8N_ENCRYPTION_KEY=your_secure_encryption_key
8
-
9
- # 时区设置
10
- TZ=Asia/Shanghai
 
 
 
 
 
 
 
 
 
 
 
Dockerfile CHANGED
@@ -41,6 +41,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
41
  tzdata \
42
  htop \
43
  jq \
 
44
  && ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
45
  && dpkg-reconfigure --frontend noninteractive tzdata \
46
  && apt-get clean \
 
41
  tzdata \
42
  htop \
43
  jq \
44
+ netcat-openbsd \
45
  && ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
46
  && dpkg-reconfigure --frontend noninteractive tzdata \
47
  && apt-get clean \
run.sh CHANGED
@@ -4,10 +4,19 @@ set -e
4
  current_time=$(date +"%Y-%m-%d %H:%M:%S")
5
  echo "Starting n8n at $current_time"
6
 
7
- # 等待 PostgreSQL 就绪
 
 
 
 
 
 
 
 
8
  wait_for_postgres() {
9
  echo "Waiting for PostgreSQL to start..."
10
  while ! nc -z ${DB_POSTGRESDB_HOST} ${DB_POSTGRESDB_PORT}; do
 
11
  sleep 1
12
  done
13
  echo "PostgreSQL started"
@@ -39,5 +48,11 @@ export EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS=false
39
  # 设置文件权限
40
  export N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true
41
 
 
 
 
 
 
 
42
  # 使用绝对路径调用 n8n,添加日志输出
43
  exec n8n start
 
4
  current_time=$(date +"%Y-%m-%d %H:%M:%S")
5
  echo "Starting n8n at $current_time"
6
 
7
+ # 输出数据库配置信息
8
+ echo "Database Configuration:"
9
+ echo "Host: ${DB_POSTGRESDB_HOST}"
10
+ echo "Port: ${DB_POSTGRESDB_PORT}"
11
+ echo "User: ${DB_POSTGRESDB_USER}"
12
+ echo "Database: ${DB_POSTGRESDB_DATABASE}"
13
+ echo "Type: ${DB_TYPE}"
14
+
15
+ # 等待 PostgreSQL 就绪, 并输出连接信息,超时10秒
16
  wait_for_postgres() {
17
  echo "Waiting for PostgreSQL to start..."
18
  while ! nc -z ${DB_POSTGRESDB_HOST} ${DB_POSTGRESDB_PORT}; do
19
+ echo "Trying to connect to PostgreSQL at ${DB_POSTGRESDB_HOST}:${DB_POSTGRESDB_PORT}..."
20
  sleep 1
21
  done
22
  echo "PostgreSQL started"
 
48
  # 设置文件权限
49
  export N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true
50
 
51
+ echo "Starting n8n with the following configuration:"
52
+ echo "N8N_HOST: ${N8N_HOST}"
53
+ echo "N8N_PORT: ${N8N_PORT}"
54
+ echo "N8N_PROTOCOL: ${N8N_PROTOCOL}"
55
+ echo "WEBHOOK_URL: ${WEBHOOK_URL}"
56
+
57
  # 使用绝对路径调用 n8n,添加日志输出
58
  exec n8n start