orztv
commited on
Commit
·
210b72b
1
Parent(s):
66ad11c
update
Browse files- Dockerfile +4 -4
- docker/startup.sh +8 -1
Dockerfile
CHANGED
@@ -1,10 +1,10 @@
|
|
1 |
FROM nocodb/nocodb:latest
|
2 |
|
3 |
# 创建数据目录、设置权限并安装 PostgreSQL 和 Redis
|
4 |
-
RUN
|
5 |
-
|
|
|
6 |
apk add --no-cache postgresql postgresql-contrib redis && \
|
7 |
-
adduser -D -u 1000 nocodb && \
|
8 |
echo "nocodb:nocodb_password" | chpasswd && \
|
9 |
chown nocodb:nocodb /run/postgresql && \
|
10 |
su - nocodb -c "initdb -D /usr/app/data/pgdata" && \
|
@@ -35,7 +35,7 @@ ENV LITESTREAM_S3_SKIP_VERIFY=false \
|
|
35 |
PORT=8080 \
|
36 |
NC_ALLOW_LOCAL_HOOKS=true \
|
37 |
NC_DB="pg://localhost:5432?u=nocodb&p=nocodb_password&d=nocodb" \
|
38 |
-
NC_REDIS_URL="redis://:redis_password@
|
39 |
|
40 |
EXPOSE 8080 5432 6380
|
41 |
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
|
|
|
1 |
FROM nocodb/nocodb:latest
|
2 |
|
3 |
# 创建数据目录、设置权限并安装 PostgreSQL 和 Redis
|
4 |
+
RUN adduser -D -u 1000 nocodb && \
|
5 |
+
mkdir -p /usr/app/data /run/postgresql /var/log/redis /var/log/postgresql && \
|
6 |
+
chown -R nocodb:nocodb /usr/app /usr/src/app /usr /run/postgresql /var/log/redis /var/log/postgresql /var/log && \
|
7 |
apk add --no-cache postgresql postgresql-contrib redis && \
|
|
|
8 |
echo "nocodb:nocodb_password" | chpasswd && \
|
9 |
chown nocodb:nocodb /run/postgresql && \
|
10 |
su - nocodb -c "initdb -D /usr/app/data/pgdata" && \
|
|
|
35 |
PORT=8080 \
|
36 |
NC_ALLOW_LOCAL_HOOKS=true \
|
37 |
NC_DB="pg://localhost:5432?u=nocodb&p=nocodb_password&d=nocodb" \
|
38 |
+
NC_REDIS_URL="redis://:redis_password@localhost:6380/4"
|
39 |
|
40 |
EXPOSE 8080 5432 6380
|
41 |
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
|
docker/startup.sh
CHANGED
@@ -38,11 +38,17 @@ psql -U nocodb -d template1 -c "SELECT 1 FROM pg_database WHERE datname = 'nocod
|
|
38 |
psql -U nocodb -d template1 -c "ALTER USER nocodb WITH PASSWORD 'nocodb_password';"
|
39 |
|
40 |
log "启动 Redis..."
|
|
|
|
|
|
|
|
|
|
|
41 |
redis-server /etc/redis.conf --port 6380 --daemonize yes
|
42 |
|
43 |
# 等待 Redis 启动
|
44 |
for i in $(seq 1 30); do
|
45 |
if redis-cli -p 6380 ping; then
|
|
|
46 |
break
|
47 |
fi
|
48 |
log "等待 Redis 启动..."
|
@@ -50,7 +56,8 @@ for i in $(seq 1 30); do
|
|
50 |
done
|
51 |
|
52 |
if ! redis-cli -p 6380 ping; then
|
53 |
-
log "Redis
|
|
|
54 |
exit 1
|
55 |
fi
|
56 |
|
|
|
38 |
psql -U nocodb -d template1 -c "ALTER USER nocodb WITH PASSWORD 'nocodb_password';"
|
39 |
|
40 |
log "启动 Redis..."
|
41 |
+
# 检查 Redis 配置文件权限
|
42 |
+
ls -l /etc/redis.conf
|
43 |
+
# 检查 Redis 日志目录权限
|
44 |
+
ls -l /var/log/redis
|
45 |
+
# 尝试以当前用户启动 Redis
|
46 |
redis-server /etc/redis.conf --port 6380 --daemonize yes
|
47 |
|
48 |
# 等待 Redis 启动
|
49 |
for i in $(seq 1 30); do
|
50 |
if redis-cli -p 6380 ping; then
|
51 |
+
log "Redis 已成功启动"
|
52 |
break
|
53 |
fi
|
54 |
log "等待 Redis 启动..."
|
|
|
56 |
done
|
57 |
|
58 |
if ! redis-cli -p 6380 ping; then
|
59 |
+
log "Redis 启动失败,查看日志:"
|
60 |
+
cat /var/log/redis/redis.log
|
61 |
exit 1
|
62 |
fi
|
63 |
|