orztv commited on
Commit
88b4d8a
·
1 Parent(s): 59620c3
Files changed (2) hide show
  1. Dockerfile +6 -3
  2. docker/startup.sh +4 -0
Dockerfile CHANGED
@@ -2,8 +2,8 @@ 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 && \
@@ -14,8 +14,11 @@ RUN adduser -D -u 1000 nocodb && \
14
  sed -i 's/bind 127.0.0.1/bind 0.0.0.0/' /etc/redis.conf && \
15
  sed -i 's/dir .\//dir \/usr\/app\/data\//' /etc/redis.conf && \
16
  sed -i 's/logfile ""/logfile "\/var\/log\/redis\/redis.log"/' /etc/redis.conf && \
 
 
 
17
  chmod 644 /etc/redis.conf && \
18
- chown -R nocodb:nocodb /etc/redis.conf /var/log/redis
19
 
20
  # 复制启动脚本并设置权限
21
  COPY docker/startup.sh /usr/src/appEntry/startup.sh
 
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 /var/run/redis && \
6
+ chown -R nocodb:nocodb /usr/app /usr/src/app /usr /run/postgresql /var/log/redis /var/log/postgresql /var/log /var/run/redis && \
7
  apk add --no-cache postgresql postgresql-contrib redis && \
8
  echo "nocodb:nocodb_password" | chpasswd && \
9
  chown nocodb:nocodb /run/postgresql && \
 
14
  sed -i 's/bind 127.0.0.1/bind 0.0.0.0/' /etc/redis.conf && \
15
  sed -i 's/dir .\//dir \/usr\/app\/data\//' /etc/redis.conf && \
16
  sed -i 's/logfile ""/logfile "\/var\/log\/redis\/redis.log"/' /etc/redis.conf && \
17
+ sed -i 's/# unixsocket/unixsocket/' /etc/redis.conf && \
18
+ sed -i 's/# unixsocketperm 700/unixsocketperm 777/' /etc/redis.conf && \
19
+ echo "pidfile /var/run/redis/redis.pid" >> /etc/redis.conf && \
20
  chmod 644 /etc/redis.conf && \
21
+ chown -R nocodb:nocodb /etc/redis.conf /var/log/redis /var/run/redis
22
 
23
  # 复制启动脚本并设置权限
24
  COPY docker/startup.sh /usr/src/appEntry/startup.sh
docker/startup.sh CHANGED
@@ -44,6 +44,8 @@ ls -l /etc/redis.conf
44
  ls -l /var/log/redis
45
  # 检查 Redis 数据目录权限
46
  ls -l /usr/app/data
 
 
47
  # 尝试以当前用户启动 Redis
48
  redis-server /etc/redis.conf --port 6380 --daemonize yes
49
 
@@ -62,6 +64,8 @@ if ! redis-cli -p 6380 ping; then
62
  cat /var/log/redis/redis.log
63
  log "Redis 进程状态:"
64
  ps aux | grep redis-server
 
 
65
  exit 1
66
  fi
67
 
 
44
  ls -l /var/log/redis
45
  # 检查 Redis 数据目录权限
46
  ls -l /usr/app/data
47
+ # 检查 Redis 运行目录权限
48
+ ls -l /var/run/redis
49
  # 尝试以当前用户启动 Redis
50
  redis-server /etc/redis.conf --port 6380 --daemonize yes
51
 
 
64
  cat /var/log/redis/redis.log
65
  log "Redis 进程状态:"
66
  ps aux | grep redis-server
67
+ log "Redis 套接字状态:"
68
+ ls -l /var/run/redis
69
  exit 1
70
  fi
71