From ea93d4ef4d566bd2637902d4c401426da1ee3e80 Mon Sep 17 00:00:00 2001
From: DDSRem <73049927+DDSRem@users.noreply.github.com>
Date: Fri, 27 Dec 2024 19:39:21 +0800
Subject: [PATCH] bump: xiaoya glue python 3.11 to 3.12

---
 glue_python/115cookie/requirements.txt           |  4 ----
 glue_python/Dockerfile                           | 10 ++--------
 glue_python/aliyunopentoken/requirements.txt     |  4 ----
 glue_python/aliyuntoken/requirements.txt         |  4 ----
 glue_python/get_folder_id/requirements.txt       |  3 ---
 glue_python/quark_cookie/requirements.txt        |  4 ----
 glue_python/{aliyuntvtoken => }/requirements.txt |  6 ++++--
 glue_python/uc_cookie/requirements.txt           |  4 ----
 8 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 glue_python/115cookie/requirements.txt
 delete mode 100644 glue_python/aliyunopentoken/requirements.txt
 delete mode 100644 glue_python/aliyuntoken/requirements.txt
 delete mode 100644 glue_python/get_folder_id/requirements.txt
 delete mode 100644 glue_python/quark_cookie/requirements.txt
 rename glue_python/{aliyuntvtoken => }/requirements.txt (62%)
 delete mode 100644 glue_python/uc_cookie/requirements.txt

diff --git a/glue_python/115cookie/requirements.txt b/glue_python/115cookie/requirements.txt
deleted file mode 100644
index a6c579b7f7..0000000000
--- a/glue_python/115cookie/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-flask
-pillow
-qrcode
-argparse
\ No newline at end of file
diff --git a/glue_python/Dockerfile b/glue_python/Dockerfile
index 65b2afe85f..2810c1abad 100644
--- a/glue_python/Dockerfile
+++ b/glue_python/Dockerfile
@@ -1,12 +1,6 @@
-FROM xiaoyaliu/glue:python
+FROM python:3.12-alpine3.20
 
 COPY --chmod=755 . /
 
 RUN pip install --no-cache --upgrade pip && \
-    pip install --no-cache -r /115cookie/requirements.txt && \
-    pip install --no-cache -r /aliyuntvtoken/requirements.txt && \
-    pip install --no-cache -r /aliyuntoken/requirements.txt && \
-    pip install --no-cache -r /aliyunopentoken/requirements.txt && \
-    pip install --no-cache -r /quark_cookie/requirements.txt && \
-    pip install --no-cache -r /uc_cookie/requirements.txt && \
-    pip install --no-cache -r /get_folder_id/requirements.txt
+    pip install --no-cache -r /requirements.txt
diff --git a/glue_python/aliyunopentoken/requirements.txt b/glue_python/aliyunopentoken/requirements.txt
deleted file mode 100644
index 4c39e4fea1..0000000000
--- a/glue_python/aliyunopentoken/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-flask
-requests
-qrcode
-argparse
\ No newline at end of file
diff --git a/glue_python/aliyuntoken/requirements.txt b/glue_python/aliyuntoken/requirements.txt
deleted file mode 100644
index 4c39e4fea1..0000000000
--- a/glue_python/aliyuntoken/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-flask
-requests
-qrcode
-argparse
\ No newline at end of file
diff --git a/glue_python/get_folder_id/requirements.txt b/glue_python/get_folder_id/requirements.txt
deleted file mode 100644
index 88435faeb2..0000000000
--- a/glue_python/get_folder_id/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-aligo
-argparse
-requests
\ No newline at end of file
diff --git a/glue_python/quark_cookie/requirements.txt b/glue_python/quark_cookie/requirements.txt
deleted file mode 100644
index db61b024c9..0000000000
--- a/glue_python/quark_cookie/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-flask
-qrcode
-requests
-argparse
\ No newline at end of file
diff --git a/glue_python/aliyuntvtoken/requirements.txt b/glue_python/requirements.txt
similarity index 62%
rename from glue_python/aliyuntvtoken/requirements.txt
rename to glue_python/requirements.txt
index df3b624716..489339c288 100644
--- a/glue_python/aliyuntvtoken/requirements.txt
+++ b/glue_python/requirements.txt
@@ -1,5 +1,7 @@
 flask
+pillow
+qrcode
+argparse
 requests
 pycryptodome
-qrcode
-argparse
\ No newline at end of file
+aligo
\ No newline at end of file
diff --git a/glue_python/uc_cookie/requirements.txt b/glue_python/uc_cookie/requirements.txt
deleted file mode 100644
index db61b024c9..0000000000
--- a/glue_python/uc_cookie/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-flask
-qrcode
-requests
-argparse
\ No newline at end of file