dragg2 commited on
Commit
0f0189d
·
verified ·
1 Parent(s): 6b8c691

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +12 -11
Dockerfile CHANGED
@@ -1,4 +1,4 @@
1
- FROM ymlisoft/kkfileview
2
 
3
  USER root
4
 
@@ -9,8 +9,7 @@ RUN apt-get update && apt-get install -y \
9
  xvfb \
10
  && rm -rf /var/lib/apt/lists/*
11
 
12
- # 环境变量
13
- ENV SERVER_PORT=7860
14
  ENV KKFILEVIEW_SECURITY_TRUST_HOST=default
15
  ENV AUTH_USERNAME=admin
16
  ENV AUTH_PASSWORD=123456
@@ -26,7 +25,7 @@ RUN rm -f /etc/nginx/sites-enabled/default && \
26
  auth_basic_user_file /etc/nginx/.htpasswd;\n\
27
  \n\
28
  location / {\n\
29
- proxy_pass http://127.0.0.1:7860;\n\
30
  proxy_set_header Host $host;\n\
31
  proxy_set_header X-Real-IP $remote_addr;\n\
32
  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n\
@@ -43,7 +42,7 @@ set -e\n\
43
  echo "=== kkFileView with Password Protection ==="\n\
44
  echo ""\n\
45
  \n\
46
- # 创建密码文件(使用环境变量)\n\
47
  echo "Creating password file..."\n\
48
  htpasswd -cb /etc/nginx/.htpasswd "$AUTH_USERNAME" "$AUTH_PASSWORD"\n\
49
  echo "✓ Username: $AUTH_USERNAME"\n\
@@ -58,15 +57,17 @@ sleep 2\n\
58
  echo "✓ Xvfb started"\n\
59
  echo ""\n\
60
  \n\
61
- # 启动 kkFileView(后台)\n\
62
- echo "Starting kkFileView on port 78607860..."\n\
63
- /opt/kkFileView/bin/kkFileView --server.port=7860 &\n\
64
  KKFILEVIEW_PID=$!\n\
65
  echo "✓ kkFileView PID: $KKFILEVIEW_PID"\n\
66
- sleep 5\n\
67
- echo ""\n\
68
  \n\
69
- # 启动 Nginx(前台)\n\
 
 
 
 
70
  echo "Starting Nginx on port 7860..."\n\
71
  echo "✓ Ready! Access with username and password"\n\
72
  echo ""\n\
 
1
+ FROM ymlisoft/kkfileview:4.4.0
2
 
3
  USER root
4
 
 
9
  xvfb \
10
  && rm -rf /var/lib/apt/lists/*
11
 
12
+ ENV SERVER_PORT=8012
 
13
  ENV KKFILEVIEW_SECURITY_TRUST_HOST=default
14
  ENV AUTH_USERNAME=admin
15
  ENV AUTH_PASSWORD=123456
 
25
  auth_basic_user_file /etc/nginx/.htpasswd;\n\
26
  \n\
27
  location / {\n\
28
+ proxy_pass http://127.0.0.1:8012;\n\
29
  proxy_set_header Host $host;\n\
30
  proxy_set_header X-Real-IP $remote_addr;\n\
31
  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n\
 
42
  echo "=== kkFileView with Password Protection ==="\n\
43
  echo ""\n\
44
  \n\
45
+ # 创建密码文件\n\
46
  echo "Creating password file..."\n\
47
  htpasswd -cb /etc/nginx/.htpasswd "$AUTH_USERNAME" "$AUTH_PASSWORD"\n\
48
  echo "✓ Username: $AUTH_USERNAME"\n\
 
57
  echo "✓ Xvfb started"\n\
58
  echo ""\n\
59
  \n\
60
+ # 启动 kkFileView(后台运行在 8012)\n\
61
+ echo "Starting kkFileView on port 8012..."\n\
62
+ /opt/kkFileView/bin/kkFileView --server.port=8012 >/tmp/kkfileview.log 2>&1 &\n\
63
  KKFILEVIEW_PID=$!\n\
64
  echo "✓ kkFileView PID: $KKFILEVIEW_PID"\n\
 
 
65
  \n\
66
+ # 等待 kkFileView 启动\n\
67
+ echo "Waiting for kkFileView to be ready..."\n\
68
+ sleep 10\n\
69
+ \n\
70
+ # 启动 Nginx)\n\
71
  echo "Starting Nginx on port 7860..."\n\
72
  echo "✓ Ready! Access with username and password"\n\
73
  echo ""\n\