Merge pull request #148 from aipeach/patch-4

Update Docker

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.18-slim-bookworm AS compile-image
+FROM python:3.11.7-slim-bookworm AS compile-image
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
@@ -11,7 +11,7 @@ ADD https://raw.githubusercontent.com/AirportR/FullTclash/dev/requirements.txt .
 RUN pip3 install --no-cache-dir -r requirements.txt && \
     pip3 install --no-cache-dir supervisor
 
-FROM python:3.9.18-slim-bookworm
+FROM python:3.11.7-slim-bookworm
 
 ENV TZ=Asia/Shanghai
 ENV admin=12345678

docker/Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM python:3.9.18-alpine3.18 AS compile-image
+FROM python:3.11.7-alpine3.19 AS compile-image
 
 RUN apk add --no-cache \
     gcc g++ make libffi-dev libstdc++ gcompat libgcc build-base py3-pybind11-dev abseil-cpp-dev re2-dev ca-certificates
@@ -10,7 +10,7 @@ ADD https://raw.githubusercontent.com/AirportR/FullTclash/dev/requirements.txt .
 RUN pip3 install --no-cache-dir -r requirements.txt && \
     pip3 install --no-cache-dir supervisor
 
-FROM python:3.9.18-alpine3.18
+FROM python:3.11.7-alpine3.19
 
 ENV TZ=Asia/Shanghai
 ENV admin=12345678

docker/fulltclash.conf

@@ -1,4 +1,5 @@
 [program:fulltclash]
-command=python3 /app/main.py
+command=python3 -u /app/main.py
 directory=/app
+redirect_stderr=true
 stdout_logfile=/var/log/fulltclash.log

docker/update.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-source ~/.bashrc
+. /etc/profile
 
 git_version=$(git --git-dir='/app/.git' --work-tree='/app' rev-parse HEAD)
 last_version=$(curl -Ls "https://api.github.com/repos/AirportR/FullTclash/commits/dev" | jq .sha | sed -E 's/.*"([^"]+)".*/\1/')