update

Dockerfile

@@ -1,20 +1,24 @@
 FROM nocodb/nocodb:latest
 
-ARG NC_S3_BUCKET_NAME
-ARG NC_S3_REGION
-ARG NC_S3_ENDPOINT
-ARG NC_S3_ACCESS_KEY
-ARG NC_S3_ACCESS_SECRET
-
-# 创建数据目录并设置适当的权限
-RUN mkdir -p /usr/app/data && chown -R 1000:1000 /usr/app /usr/src/app /usr
+# 创建数据目录、设置权限并安装 PostgreSQL 和 Redis
+RUN mkdir -p /usr/app/data /run/postgresql && \
+    chown -R 1000:1000 /usr/app /usr/src/app /usr && \
+    apk add --no-cache postgresql postgresql-contrib redis && \
+    adduser -D -u 1000 nocodb && \
+    echo "nocodb:nocodb_password" | chpasswd && \
+    chown nocodb:nocodb /run/postgresql && \
+    su - nocodb -c "initdb -D /usr/app/data/pgdata" && \
+    echo "host all all 0.0.0.0/0 md5" >> /usr/app/data/pgdata/pg_hba.conf && \
+    echo "listen_addresses='*'" >> /usr/app/data/pgdata/postgresql.conf && \
+    sed -i 's/# requirepass foobared/requirepass redis_password/' /etc/redis.conf && \
+    sed -i 's/bind 127.0.0.1/bind 0.0.0.0/' /etc/redis.conf
 
 # 复制启动脚本并设置权限
 COPY docker/startup.sh /usr/src/appEntry/startup.sh
 RUN chmod +x /usr/src/appEntry/startup.sh
 
-# 切换到非 root 用户
-USER 1000
+# 切换到 nocodb 用户
+USER nocodb
 
 WORKDIR /usr/src/app
 
@@ -28,19 +32,11 @@ ENV LITESTREAM_S3_SKIP_VERIFY=false \
     NODE_ENV=production \
     PORT=8080 \
     NC_ALLOW_LOCAL_HOOKS=true \
-    S3_BUCKET_NAME=${NC_S3_BUCKET_NAME} \
-    S3_REGION=${NC_S3_REGION} \
-    S3_ENDPOINT=${NC_S3_ENDPOINT} \
-    S3_ACCESS_KEY=${NC_S3_ACCESS_KEY} \
-    S3_ACCESS_SECRET=${NC_S3_ACCESS_SECRET} \
-    LITESTREAM_S3_BUCKET=${NC_S3_BUCKET_NAME} \
-    LITESTREAM_S3_REGION=${NC_S3_REGION} \
-    LITESTREAM_S3_ENDPOINT=${NC_S3_ENDPOINT} \
-    LITESTREAM_S3_ACCESS_KEY_ID=${NC_S3_ACCESS_KEY} \
-    LITESTREAM_S3_SECRET_ACCESS_KEY=${NC_S3_ACCESS_SECRET}
+    NC_DB="pg://localhost:5432?u=nocodb&p=nocodb_password&d=nocodb" \
+    NC_REDIS_URL="redis://:[email protected]:6380/4"
 
-EXPOSE 8080
+EXPOSE 8080 5432 6380
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 
 # 运行启动脚本
-CMD ["/usr/src/appEntry/startup.sh"]
+CMD ["/usr/src/appEntry/startup.sh"]

Dockerfile-1

@@ -0,0 +1,46 @@
+FROM nocodb/nocodb:latest
+
+ARG NC_S3_BUCKET_NAME
+ARG NC_S3_REGION
+ARG NC_S3_ENDPOINT
+ARG NC_S3_ACCESS_KEY
+ARG NC_S3_ACCESS_SECRET
+
+# 创建数据目录并设置适当的权限
+RUN mkdir -p /usr/app/data && chown -R 1000:1000 /usr/app /usr/src/app /usr
+
+# 复制启动脚本并设置权限
+COPY docker/startup.sh /usr/src/appEntry/startup.sh
+RUN chmod +x /usr/src/appEntry/startup.sh
+
+# 切换到非 root 用户
+USER 1000
+
+WORKDIR /usr/src/app
+
+ENV LITESTREAM_S3_SKIP_VERIFY=false \
+    LITESTREAM_RETENTION=1440h \
+    LITESTREAM_RETENTION_CHECK_INTERVAL=72h \
+    LITESTREAM_SNAPSHOT_INTERVAL=24h \
+    LITESTREAM_SYNC_INTERVAL=60s \
+    NC_DOCKER=0.6 \
+    NC_TOOL_DIR=/usr/app/data/ \
+    NODE_ENV=production \
+    PORT=8080 \
+    NC_ALLOW_LOCAL_HOOKS=true \
+    S3_BUCKET_NAME=${NC_S3_BUCKET_NAME} \
+    S3_REGION=${NC_S3_REGION} \
+    S3_ENDPOINT=${NC_S3_ENDPOINT} \
+    S3_ACCESS_KEY=${NC_S3_ACCESS_KEY} \
+    S3_ACCESS_SECRET=${NC_S3_ACCESS_SECRET} \
+    LITESTREAM_S3_BUCKET=${NC_S3_BUCKET_NAME} \
+    LITESTREAM_S3_REGION=${NC_S3_REGION} \
+    LITESTREAM_S3_ENDPOINT=${NC_S3_ENDPOINT} \
+    LITESTREAM_S3_ACCESS_KEY_ID=${NC_S3_ACCESS_KEY} \
+    LITESTREAM_S3_SECRET_ACCESS_KEY=${NC_S3_ACCESS_SECRET}
+
+EXPOSE 8080
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+
+# 运行启动脚本
+CMD ["/usr/src/appEntry/startup.sh"]

docker/startup.sh

@@ -1,18 +1,57 @@
 #!/bin/sh
+set -e
 
-echo "当前用户："
+log() {
+    echo "[$(date +'%Y-%m-%d %H:%M:%S')] $1"
+}
+
+log "当前用户："
 whoami
 cat /etc/passwd
 
-echo "\nNode.js 版本："
-node --version
-which node
-
-echo "\n系统信息："
+log "系统信息："
 cat /etc/os-release
 
-echo "\n环境变量："
+log "环境变量："
 env | grep -E "NC_|LITESTREAM_|S3_"
 
-echo "\n启动主程序..."
+log "启动 PostgreSQL..."
+pg_ctl -D /usr/app/data/pgdata -l /usr/app/data/pgdata/logfile start
+
+# 等待 PostgreSQL 启动
+for i in $(seq 1 30); do
+    if pg_isready -U nocodb; then
+        break
+    fi
+    log "等待 PostgreSQL 启动..."
+    sleep 2
+done
+
+if ! pg_isready -U nocodb; then
+    log "PostgreSQL 启动失败"
+    exit 2
+fi
+
+log "检查并创建 PostgreSQL 数据库和用户..."
+psql -U nocodb -tc "SELECT 1 FROM pg_database WHERE datname = 'nocodb';" | grep -q 1 || psql -U nocodb -c "CREATE DATABASE nocodb;"
+psql -U nocodb -tc "SELECT 1 FROM pg_roles WHERE rolname = 'nocodb';" | grep -q 1 || psql -U nocodb -c "ALTER USER nocodb WITH PASSWORD 'nocodb_password';"
+
+log "启动 Redis..."
+redis-server /etc/redis.conf --port 6380 --daemonize yes
+
+# 等待 Redis 启动
+for i in $(seq 1 30); do
+    if redis-cli -p 6380 ping; then
+        break
+    fi
+    log "等待 Redis 启动..."
+    sleep 1
+done
+
+if ! redis-cli -p 6380 ping; then
+    log "Redis 启动失败"
+    exit 1
+fi
+
+log "启动主程序..."
 exec /usr/src/appEntry/start.sh