orztv commited on
Commit
c36ae83
·
1 Parent(s): 848df0a
Files changed (2) hide show
  1. Dockerfile +2 -1
  2. docker/startup.sh +9 -0
Dockerfile CHANGED
@@ -18,7 +18,8 @@ RUN adduser -D -u 1000 nocodb && \
18
  sed -i 's/# unixsocketperm 700/unixsocketperm 777/' /etc/redis.conf && \
19
  echo "pidfile /var/run/redis/redis.pid" >> /etc/redis.conf && \
20
  chmod 644 /etc/redis.conf && \
21
- chown -R nocodb:nocodb /etc/redis.conf /var/log/redis /var/run/redis /usr/app/data /var/lib/redis
 
22
 
23
  # 复制启动脚本并设置权限
24
  COPY docker/startup.sh /usr/src/appEntry/startup.sh
 
18
  sed -i 's/# unixsocketperm 700/unixsocketperm 777/' /etc/redis.conf && \
19
  echo "pidfile /var/run/redis/redis.pid" >> /etc/redis.conf && \
20
  chmod 644 /etc/redis.conf && \
21
+ chown -R nocodb:nocodb /etc/redis.conf /var/log/redis /var/run/redis /usr/app/data /var/lib/redis && \
22
+ apk add --update --no-cache dasel dumb-init nodejs
23
 
24
  # 复制启动脚本并设置权限
25
  COPY docker/startup.sh /usr/src/appEntry/startup.sh
docker/startup.sh CHANGED
@@ -53,5 +53,14 @@ if ! redis-cli -p 6379 -a redis_password ping; then
53
  exit 1
54
  fi
55
 
 
 
 
 
 
 
 
 
 
56
  log "启动主程序..."
57
  exec /usr/src/appEntry/start.sh
 
53
  exit 1
54
  fi
55
 
56
+ log "Nginx 配置文件内容:"
57
+ if [ -f /etc/nginx/nginx.conf ]; then
58
+ cat /etc/nginx/nginx.conf
59
+ elif [ -f /usr/local/nginx/conf/nginx.conf ]; then
60
+ cat /usr/local/nginx/conf/nginx.conf
61
+ else
62
+ log "未找到 Nginx 配置文件"
63
+ fi
64
+
65
  log "启动主程序..."
66
  exec /usr/src/appEntry/start.sh