From 6c7b3fddb9745a9a7e251fcbd0272650a794b2ee Mon Sep 17 00:00:00 2001 From: cola <44671411+aipeach@users.noreply.github.com> Date: Wed, 3 Jan 2024 01:38:48 +0800 Subject: [PATCH 1/3] Fix update.sh --- docker/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/update.sh b/docker/update.sh index 42cbf0e8..ad1bb4ab 100644 --- a/docker/update.sh +++ b/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/') From a3cc4c4ac5ce24deca40691b6f671b2b067b3da3 Mon Sep 17 00:00:00 2001 From: cola <44671411+aipeach@users.noreply.github.com> Date: Wed, 3 Jan 2024 01:41:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Fix=20=E4=BF=AE=E5=A4=8Dsupervisord?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E4=B8=8D=E5=86=99=E5=85=A5=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/fulltclash.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/fulltclash.conf b/docker/fulltclash.conf index c5a86a47..fdd34912 100644 --- a/docker/fulltclash.conf +++ b/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 \ No newline at end of file From 88fc17013cad3dbb066690886247e31752085c06 Mon Sep 17 00:00:00 2001 From: cola <44671411+aipeach@users.noreply.github.com> Date: Wed, 3 Jan 2024 01:43:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Update=20=E6=9B=B4=E6=96=B0Docker=E9=95=9C?= =?UTF-8?q?=E5=83=8Fpython=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 4 ++-- docker/Dockerfile.alpine | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e6ec2137..ca33048e 100644 --- a/docker/Dockerfile +++ b/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 diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 05e9eef8..40bcf2ba 100644 --- a/docker/Dockerfile.alpine +++ b/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