update

Dockerfile

@@ -29,9 +29,7 @@ RUN adduser -D -u 1000 nocodb && \
 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 "S3_BUCKET_NAME=$(cat /run/secrets/NC_S3_BUCKET_NAME)" >> /tmp/s3_env && \
-    echo "S3_ACCESS_SECRET=$(cat /run/secrets/NC_S3_ACCESS_SECRET)" >> /tmp/s3_env && \
-    echo "LITESTREAM_S3_BUCKET=$(cat /run/secrets/NC_S3_BUCKET_NAME)" >> /tmp/s3_env && \
-    echo "LITESTREAM_S3_ACCESS_KEY_ID=$(cat /run/secrets/NC_S3_ACCESS_KEY)" >> /tmp/s3_env
+    echo "S3_ACCESS_SECRET=$(cat /run/secrets/NC_S3_ACCESS_SECRET)" >> /tmp/s3_env
 
 # 复制启动脚本和 Node.js 示例程序并设置权限
 COPY docker/startup.sh /usr/src/appEntry/startup.sh

docker/startup.sh

@@ -6,15 +6,16 @@ log() {
 }
 
 log "检查 secret 环境变量："
-for var in S3_BUCKET_NAME S3_ACCESS_SECRET LITESTREAM_S3_BUCKET LITESTREAM_S3_ACCESS_KEY_ID
-do
-    eval value=\$$var
-    if [ -n "$value" ]; then
-        log "$var: $value"
-    else
-        log "$var: 未设置"
-    fi
-done
+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 "Litestream 环境变量："
+log "LITESTREAM_S3_BUCKET: $LITESTREAM_S3_BUCKET"
+log "LITESTREAM_S3_SECRET_ACCESS_KEY: $LITESTREAM_S3_SECRET_ACCESS_KEY"
 
 log "启动 PostgreSQL..."
 pg_ctl -D /usr/app/data/pgdata -l /usr/app/data/pgdata/logfile start