update

Dockerfile

@@ -1,5 +1,11 @@
 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
+
 # 创建数据目录、设置权限并安装 PostgreSQL 和 Redis
 RUN adduser -D -u 1000 nocodb && \
     mkdir -p /usr/app/data /run/postgresql /var/log/redis /var/log/postgresql /var/run/redis && \
@@ -23,7 +29,6 @@ RUN adduser -D -u 1000 nocodb && \
 
 # 复制启动脚本和 Node.js 示例程序并设置权限
 COPY docker/startup.sh /usr/src/appEntry/startup.sh
-COPY docker/app.js /usr/src/app/docker/app.js
 RUN chmod +x /usr/src/appEntry/startup.sh
 
 # 切换到 nocodb 用户
@@ -39,13 +44,22 @@ ENV LITESTREAM_S3_SKIP_VERIFY=false \
     NC_DOCKER=0.6 \
     NC_TOOL_DIR=/usr/app/data/ \
     NODE_ENV=production \
-    PORT=8080 \
     NC_ALLOW_LOCAL_HOOKS=true \
-    NC_DB="pg://localhost:5432?u=nocodb&p=nocodb_password&d=nocodb" \
-    NC_REDIS_URL="redis://:redis_password@localhost:6379/4"
+    NC_REDIS_URL="redis://:redis_password@localhost:6379/4" \
+    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
 
-EXPOSE 8080 5432 6379 7860
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 
 # 运行启动脚本
-CMD ["/usr/src/appEntry/startup.sh"]
+CMD ["/usr/src/appEntry/startup.sh"]

Dockerfile copy

@@ -1,46 +0,0 @@
-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"]

Dockerfile-pgsql

@@ -0,0 +1,51 @@
+FROM nocodb/nocodb:latest
+
+# 创建数据目录、设置权限并安装 PostgreSQL 和 Redis
+RUN adduser -D -u 1000 nocodb && \
+    mkdir -p /usr/app/data /run/postgresql /var/log/redis /var/log/postgresql /var/run/redis && \
+    chown -R nocodb:nocodb /usr/app /usr/src/app /usr /run/postgresql /var/log/redis /var/log/postgresql /var/log && \
+    apk add --no-cache postgresql postgresql-contrib redis && \
+    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 && \
+    sed -i 's/dir .\//dir \/usr\/app\/data\//' /etc/redis.conf && \
+    sed -i 's/logfile ""/logfile "\/var\/log\/redis\/redis.log"/' /etc/redis.conf && \
+    sed -i 's/# unixsocket/unixsocket/' /etc/redis.conf && \
+    sed -i 's/# unixsocketperm 700/unixsocketperm 777/' /etc/redis.conf && \
+    echo "pidfile /var/run/redis/redis.pid" >> /etc/redis.conf && \
+    chmod 644 /etc/redis.conf && \
+    chown -R nocodb:nocodb /etc/redis.conf /var/log/redis /var/run/redis /usr/app/data /var/lib/redis && \
+    apk add --update --no-cache dasel dumb-init nodejs
+
+# 复制启动脚本和 Node.js 示例程序并设置权限
+COPY docker/startup.sh /usr/src/appEntry/startup.sh
+COPY docker/app.js /usr/src/app/docker/app.js
+RUN chmod +x /usr/src/appEntry/startup.sh
+
+# 切换到 nocodb 用户
+USER nocodb
+
+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 \
+    NC_DB="pg://localhost:5432?u=nocodb&p=nocodb_password&d=nocodb" \
+    NC_REDIS_URL="redis://:redis_password@localhost:6379/4"
+
+EXPOSE 8080 5432 6379 7860
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+
+# 运行启动脚本
+CMD ["/usr/src/appEntry/startup.sh"]

Dockerfile.plus

@@ -1,79 +0,0 @@
-# syntax=docker/dockerfile:1
-
-###########
-# Litestream Builder
-###########
-FROM golang:alpine3.19 as lt-builder
-
-WORKDIR /usr/src/
-
-RUN apk add --no-cache git make musl-dev gcc
-
-# build litestream
-RUN git clone https://github.com/benbjohnson/litestream.git litestream
-RUN cd litestream && go install ./cmd/litestream
-RUN cp $GOPATH/bin/litestream /usr/src/lt
-
-###########
-# Builder
-###########
-FROM node:18.19.1-alpine as builder
-WORKDIR /usr/src/app
-
-# install node-gyp dependencies
-RUN apk add --no-cache python3 make g++
-
-# install pnpm
-RUN corepack enable && corepack prepare pnpm@latest --activate
-
-# Copy application dependency manifests to the container image.
-COPY --link ./package.json ./package.json
-COPY --link ./docker/main.js ./docker/main.js
-COPY --link ./docker/start-litestream.sh /usr/src/appEntry/start.sh
-COPY --link src/public/ ./docker/public/
-
-# for pnpm to generate a flat node_modules without symlinks
-# so that modclean could work as expected
-RUN echo "node-linker=hoisted" > .npmrc
-
-# install production dependencies,
-# reduce node_module size with modclean & removing sqlite deps,
-# and add execute permission to start.sh
-RUN pnpm install --prod --shamefully-hoist \
-    && pnpm dlx modclean --patterns="default:*" --ignore="nc-lib-gui/**,dayjs/**,express-status-monitor/**,@azure/msal-node/dist/**" --run  \
-    && rm -rf ./node_modules/sqlite3/deps \
-    && chmod +x /usr/src/appEntry/start.sh
-
-##########
-# Runner
-##########
-FROM alpine:3.19
-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
-
-RUN apk add --update --no-cache \
-    dasel \
-    dumb-init \
-    nodejs
-
-# Copy litestream binary and config file
-COPY --link --from=lt-builder /usr/src/lt /usr/local/bin/litestream
-COPY --link ./docker/litestream.yml /etc/litestream.yml
-# Copy production code & main entry file
-COPY --link --from=builder /usr/src/app/ /usr/src/app/
-COPY --link --from=builder /usr/src/appEntry/ /usr/src/appEntry/
-
-EXPOSE 8080
-ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-
-# Start Nocodb
-CMD ["/usr/src/appEntry/start.sh"]

docker/app.js

@@ -1,12 +0,0 @@
-const http = require('http');
-
-const server = http.createServer((req, res) => {
-  res.statusCode = 200;
-  res.setHeader('Content-Type', 'text/plain');
-  res.end('你好，世界！\n');
-});
-
-const port = 7860;
-server.listen(port, () => {
-  console.log(`服务器运行在 http://localhost:${port}/`);
-});

docker/startup.sh

@@ -53,8 +53,5 @@ if ! redis-cli -p 6379 -a redis_password ping; then
     exit 1
 fi
 
-log "启动 Node.js 示例程序..."
-node /usr/src/app/docker/app.js &
-
 log "启动主程序..."
 exec /usr/src/appEntry/start.sh