update sth. at 2024-10-30 12:12:36

Dockerfile

@@ -6,16 +6,20 @@ RUN apk add --no-cache nginx socat
 
 # 创建 nginx 所需的目录并赋予权限
 RUN mkdir -p /var/lib/nginx/tmp/client_body /var/lib/nginx/logs && \
-    chmod -R 777 /var/lib/nginx
-
-# 创建 nginx 配置目录和日志目录
-RUN mkdir -p /var/log/nginx /etc/nginx/conf.d
+    chmod -R 777 /var/lib/nginx && \
+    mkdir -p /var/log/nginx /etc/nginx/conf.d && \
+    touch /var/log/nginx/access.log /var/log/nginx/error.log && \
+    chmod 777 /var/log/nginx/access.log /var/log/nginx/error.log
 
 # 拷贝 nginx 配置文件
 COPY nginx.conf /etc/nginx/nginx.conf
 
-# 暴露端口 7860
+# 暴露对外端口 7860
 EXPOSE 7860
 
-# 启动命令，增加日志输出
-CMD (socat TCP-LISTEN:7860,fork TCP:localhost:8080 & nginx && echo "nginx started" && /app/duck2api) || (echo "Service failed to start" && tail -f /var/log/nginx/error.log)
+# 创建启动脚本并赋予执行权限
+COPY start.sh /start.sh
+RUN chmod +x /start.sh
+
+# 设置启动命令
+CMD ["/start.sh"]

nginx.conf

@@ -6,12 +6,14 @@ http {
     include       /etc/nginx/mime.types;
     access_log    /var/log/nginx/access.log;
     error_log     /var/log/nginx/error.log;
+    keepalive_timeout 65;
 
     server {
         listen 7860;
         server_name localhost;
 
         location / {
+            # 代理请求到内部服务端口 8080
             proxy_pass         http://127.0.0.1:8080;
             proxy_http_version 1.1;
             proxy_set_header   Upgrade $http_upgrade;

start.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# 启动 nginx 和 duck2api 服务
+echo "Starting nginx..."
+nginx &
+echo "Starting duck2api..."
+
+/app/duck2api