fuliai commited on
Commit
fb5d6be
·
verified ·
1 Parent(s): 17e3d84

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +10 -11
Dockerfile CHANGED
@@ -13,16 +13,18 @@ ARG DB_POSTGRESDB_PORT=$DB_POSTGRESDB_PORT
13
  ARG DB_POSTGRESDB_USER=$DB_POSTGRESDB_USER
14
  ARG DB_POSTGRESDB_PASSWORD=$DB_POSTGRESDB_PASSWORD
15
 
16
- # 显示构建参数(调试用)
17
  RUN --mount=type=secret,id=DB_POSTGRESDB_USER,mode=0444,required=true \
18
- echo "export DB_POSTGRESDB_USER=$(cat /run/secrets/DB_POSTGRESDB_USER)" >> $HOME/.nocodb_env
19
-
20
- RUN --mount=type=secret,id=DB_POSTGRESDB_PASSWORD,mode=0444,required=true \
21
- echo "export DB_POSTGRESDB_PASSWORD=$(cat /run/secrets/DB_POSTGRESDB_PASSWORD)" >> $HOME/.nocodb_env
 
22
 
23
- # 设置 NC_DB 环境变量
24
  ENV NC_DB="pg://${DB_POSTGRESDB_HOST}:${DB_POSTGRESDB_PORT}?u=${DB_POSTGRESDB_USER}&p=${DB_POSTGRESDB_PASSWORD}&d=${DB_POSTGRESDB_DATABASE}"
25
 
 
26
  RUN mkdir -p /usr/app /usr/src/app && \
27
  chown -R node:node /usr/app /usr/src/app && \
28
  chmod -R 755 /usr/app /usr/src/app && \
@@ -31,8 +33,5 @@ RUN mkdir -p /usr/app /usr/src/app && \
31
  # 切换回 node 用户
32
  USER node
33
 
34
- # 显示运行时环境变量和 HOME 路径
35
- RUN echo "HOME directory: $HOME"
36
- CMD echo "Runtime NC_DB: $NC_DB" && \
37
- . $HOME/.nocodb_env && \
38
- /usr/src/appEntry/start.sh
 
13
  ARG DB_POSTGRESDB_USER=$DB_POSTGRESDB_USER
14
  ARG DB_POSTGRESDB_PASSWORD=$DB_POSTGRESDB_PASSWORD
15
 
16
+ # 创建 .nocodb_env 文件并注入密钥(需构建时传递)
17
  RUN --mount=type=secret,id=DB_POSTGRESDB_USER,mode=0444,required=true \
18
+ --mount=type=secret,id=DB_POSTGRESDB_PASSWORD,mode=0444,required=true \
19
+ echo "export DB_POSTGRESDB_USER=$(cat /run/secrets/DB_POSTGRESDB_USER)" > $HOME/.nocodb_env && \
20
+ echo "export DB_POSTGRESDB_PASSWORD=$(cat /run/secrets/DB_POSTGRESDB_PASSWORD)" >> $HOME/.nocodb_env && \
21
+ chown node:node $HOME/.nocodb_env && \ # 确保 node 用户可读
22
+ chmod 600 $HOME/.nocodb_env # 限制文件权限
23
 
24
+ # 设置 NC_DB 环境变量(依赖构建参数)
25
  ENV NC_DB="pg://${DB_POSTGRESDB_HOST}:${DB_POSTGRESDB_PORT}?u=${DB_POSTGRESDB_USER}&p=${DB_POSTGRESDB_PASSWORD}&d=${DB_POSTGRESDB_DATABASE}"
26
 
27
+ # 配置目录权限
28
  RUN mkdir -p /usr/app /usr/src/app && \
29
  chown -R node:node /usr/app /usr/src/app && \
30
  chmod -R 755 /usr/app /usr/src/app && \
 
33
  # 切换回 node 用户
34
  USER node
35
 
36
+ # 运行时加载环境变量并启动
37
+ CMD ["/bin/sh", "-c", ". $HOME/.nocodb_env && /usr/src/appEntry/start.sh"]