update

Dockerfile

@@ -28,8 +28,10 @@ RUN adduser -D -u 1000 nocodb && \
 # 使用 secret 获取 S3 bucket 名称和访问密钥
 RUN --mount=type=secret,id=NC_S3_BUCKET_NAME,mode=0444,required=true \
     --mount=type=secret,id=NC_S3_ACCESS_SECRET,mode=0444,required=true \
-    echo "export S3_BUCKET_NAME=$(cat /run/secrets/NC_S3_BUCKET_NAME)" >> /etc/profile.d/s3_env.sh && \
-    echo "export S3_ACCESS_SECRET=$(cat /run/secrets/NC_S3_ACCESS_SECRET)" >> /etc/profile.d/s3_env.sh && \
+    echo "export NC_S3_BUCKET_NAME=$(cat /run/secrets/NC_S3_BUCKET_NAME)" >> /etc/profile.d/s3_env.sh && \
+    echo "export NC_S3_ACCESS_SECRET=$(cat /run/secrets/NC_S3_ACCESS_SECRET)" >> /etc/profile.d/s3_env.sh && \
+    echo "export LITESTREAM_S3_BUCKET=$(cat /run/secrets/NC_S3_BUCKET_NAME)" >> /etc/profile.d/s3_env.sh && \
+    echo "export LITESTREAM_S3_SECRET_ACCESS_KEY=$(cat /run/secrets/NC_S3_ACCESS_SECRET)" >> /etc/profile.d/s3_env.sh && \
     chmod +x /etc/profile.d/s3_env.sh
 
 # 复制启动脚本和 Node.js 示例程序并设置权限
@@ -52,9 +54,9 @@ ENV LITESTREAM_S3_SKIP_VERIFY=false \
     NODE_ENV=production \
     NC_ALLOW_LOCAL_HOOKS=true \
     NC_REDIS_URL="redis://:redis_password@localhost:6379/4" \
-    S3_REGION=${NC_S3_REGION} \
-    S3_ENDPOINT=${NC_S3_ENDPOINT} \
-    S3_ACCESS_KEY=${NC_S3_ACCESS_KEY} \
+    NC_S3_REGION=${NC_S3_REGION} \
+    NC_S3_ENDPOINT=${NC_S3_ENDPOINT} \
+    NC_S3_ACCESS_KEY=${NC_S3_ACCESS_KEY} \
     LITESTREAM_S3_REGION=${NC_S3_REGION} \
     LITESTREAM_S3_ENDPOINT=${NC_S3_ENDPOINT} \
     LITESTREAM_S3_ACCESS_KEY_ID=${NC_S3_ACCESS_KEY}

docker/startup.sh

@@ -11,16 +11,18 @@ log() {
 }
 
 log "检查 secret 环境变量："
-log "S3_ACCESS_SECRET: ${S3_ACCESS_SECRET:-未设置}"
-log "S3_BUCKET_NAME: ${S3_BUCKET_NAME:-未设置}"
-
-# 设置 Litestream 相关的环境变量
-export LITESTREAM_S3_BUCKET=${S3_BUCKET_NAME:-}
-export LITESTREAM_S3_SECRET_ACCESS_KEY=${S3_ACCESS_SECRET:-}
+log "NC_S3_ACCESS_SECRET: ${NC_S3_ACCESS_SECRET:-未设置}"
+log "NC_S3_BUCKET_NAME: ${NC_S3_BUCKET_NAME:-未设置}"
+log "NC_S3_REGION: ${NC_S3_REGION:-未设置}"
+log "NC_S3_ENDPOINT: ${NC_S3_ENDPOINT:-未设置}"
+log "NC_S3_ACCESS_KEY: ${NC_S3_ACCESS_KEY:-未设置}"
 
 log "Litestream 环境变量："
 log "LITESTREAM_S3_BUCKET: ${LITESTREAM_S3_BUCKET:-未设置}"
 log "LITESTREAM_S3_SECRET_ACCESS_KEY: ${LITESTREAM_S3_SECRET_ACCESS_KEY:-未设置}"
+log "LITESTREAM_S3_REGION: ${LITESTREAM_S3_REGION:-未设置}"
+log "LITESTREAM_S3_ENDPOINT: ${LITESTREAM_S3_ENDPOINT:-未设置}"
+log "LITESTREAM_S3_ACCESS_KEY_ID: ${LITESTREAM_S3_ACCESS_KEY_ID:-未设置}"
 
 log "启动 PostgreSQL..."
 pg_ctl -D /usr/app/data/pgdata -l /usr/app/data/pgdata/logfile start