dragg2 commited on
Commit
1930ef6
·
verified ·
1 Parent(s): f995939

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +25 -40
Dockerfile CHANGED
@@ -2,7 +2,6 @@ FROM yimik/kkfileview:latest
2
 
3
  USER root
4
 
5
- # 安装依赖
6
  RUN apt-get update && apt-get install -y \
7
  xvfb \
8
  libxrender1 \
@@ -15,52 +14,38 @@ ENV SERVER_PORT=7860
15
  # 添加执行权限
16
  RUN chmod -R 755 /opt/kkFileView-*/bin/
17
 
18
- # 先查看目录结构,找到配置文件
19
- RUN echo "=== Searching for kkFileView installation ===" && \
20
- ls -la /opt/ && \
21
- echo "" && \
22
- echo "=== Searching for config directory ===" && \
23
- find /opt -type d -name "config" && \
24
- echo "" && \
25
- echo "=== Searching for application.properties ===" && \
26
- find /opt -name "application.properties" -type f
27
 
28
- # 自动查找并修改配置文件
29
- RUN CONFIG_FILE=$(find /opt -name "application.properties" -type f | head -n 1) && \
30
- if [ -n "$CONFIG_FILE" ]; then \
31
- echo "Found config file at: $CONFIG_FILE" && \
32
- sed -i '/trust.host/d' "$CONFIG_FILE" && \
33
- echo "" >> "$CONFIG_FILE" && \
34
- echo "# Trust all hosts for Hugging Face Spaces" >> "$CONFIG_FILE" && \
35
- echo "trust.host = default" >> "$CONFIG_FILE" && \
36
- echo "" >> "$CONFIG_FILE" && \
37
- echo "# Port configuration" >> "$CONFIG_FILE" && \
38
- echo "server.port = 7860" >> "$CONFIG_FILE" && \
39
- echo "Configuration updated successfully:" && \
40
- tail -10 "$CONFIG_FILE"; \
41
- else \
42
- echo "WARNING: application.properties not found, will use environment variables" && \
43
- echo "Creating config directory..." && \
44
- mkdir -p /opt/kkFileView-4.1.0/config && \
45
- cat > /opt/kkFileView-4.1.0/config/application.properties << 'EOFCONFIG' && \
46
- server.port = 7860
47
- trust.host = default
48
- cache.enabled = true
49
- office.preview.switch.disabled = false
50
- EOFCONFIG
51
- echo "Created new config file" && \
52
- cat /opt/kkFileView-4.1.0/config/application.properties; \
53
- fi
54
 
55
  # 启动脚本
56
  RUN echo '#!/bin/bash' > /start.sh && \
57
- echo 'echo "=== kkFileView Startup ==="' >> /start.sh && \
58
- echo 'echo "Configuration:"' >> /start.sh && \
59
- echo 'find /opt -name "application.properties" -exec cat {} \;' >> /start.sh && \
60
  echo 'echo ""' >> /start.sh && \
 
61
  echo 'Xvfb :99 -screen 0 1024x768x24 &' >> /start.sh && \
62
  echo 'export DISPLAY=:99' >> /start.sh && \
63
  echo 'sleep 2' >> /start.sh && \
 
64
  echo 'cd /opt/kkFileView-4.1.0' >> /start.sh && \
65
  echo 'bash /opt/kkFileView-4.1.0/bin/startup.sh' >> /start.sh && \
66
  echo 'tail -f /opt/kkFileView-4.1.0/log/*.log' >> /start.sh && \
@@ -68,4 +53,4 @@ RUN echo '#!/bin/bash' > /start.sh && \
68
 
69
  EXPOSE 7860
70
 
71
- CMD ["/start.sh"]
 
2
 
3
  USER root
4
 
 
5
  RUN apt-get update && apt-get install -y \
6
  xvfb \
7
  libxrender1 \
 
14
  # 添加执行权限
15
  RUN chmod -R 755 /opt/kkFileView-*/bin/
16
 
17
+ # 创建配置目录(如果不存在)
18
+ RUN mkdir -p /opt/kkFileView-4.1.0/config
 
 
 
 
 
 
 
19
 
20
+ # 使用 cat 创建配置文件(正确的方式)
21
+ RUN cat > /opt/kkFileView-4.1.0/config/application.properties << 'EOF'
22
+ # kkFileView configuration for Hugging Face Spaces
23
+ server.port=7860
24
+
25
+ # Trust host configuration - CORRECT KEY NAME
26
+ preview.trust.host=default
27
+
28
+ # Cache settings
29
+ cache.enabled=true
30
+
31
+ # Office preview
32
+ office.preview.switch.disabled=false
33
+ EOF
34
+
35
+ # 验证配置文件
36
+ RUN echo "=== Configuration file created ===" && \
37
+ cat /opt/kkFileView-4.1.0/config/application.properties
 
 
 
 
 
 
 
 
38
 
39
  # 启动脚本
40
  RUN echo '#!/bin/bash' > /start.sh && \
41
+ echo 'echo "=== kkFileView Configuration ==="' >> /start.sh && \
42
+ echo 'cat /opt/kkFileView-4.1.0/config/application.properties' >> /start.sh && \
 
43
  echo 'echo ""' >> /start.sh && \
44
+ echo 'echo "Starting Xvfb..."' >> /start.sh && \
45
  echo 'Xvfb :99 -screen 0 1024x768x24 &' >> /start.sh && \
46
  echo 'export DISPLAY=:99' >> /start.sh && \
47
  echo 'sleep 2' >> /start.sh && \
48
+ echo 'echo "Starting kkFileView..."' >> /start.sh && \
49
  echo 'cd /opt/kkFileView-4.1.0' >> /start.sh && \
50
  echo 'bash /opt/kkFileView-4.1.0/bin/startup.sh' >> /start.sh && \
51
  echo 'tail -f /opt/kkFileView-4.1.0/log/*.log' >> /start.sh && \
 
53
 
54
  EXPOSE 7860
55
 
56
+ CMD ["/start.sh"]