Merge 90c868c5f8 into 5c95630aeb

docker/docker-compose.yml

@@ -1,17 +1,12 @@
 version: '2'
 services:
   ql_web:
-    image: whyour/qinglong:2.11.3
+    image: whyour/qinglong:2.17.9
     container_name: ql
     volumes:
-      - ./data/config:/ql/config
+      - ./qinglong/data:/ql/data
-      - ./data/log:/ql/log
+      - ./qinglong/deps/pnpm:/root/.local/share/pnpm
-      - ./data/db:/ql/db
+      - ./qinglong/deps/pip3:/usr/local/lib/python3.11/site-packages
-      - ./data/scripts:/ql/scripts
-      - ./data/repo:/ql/repo
     ports:
-      - "0.0.0.0:5700:5700"
+      - "5700:5700"
-    environment:
+    restart: unless-stopped
-      - ENABLE_HANGUP=true
-      - ENABLE_WEB_PANEL=true
-    restart: always

docker/ql1key.sh

@@ -46,25 +46,16 @@ cd $ql_path
 cat > docker-compose.yml <<EOF
 version: '2'
 services:
-  qinglong:
+  ql_web:
-    image: whyour/qinglong:2.11.3
+    image: whyour/qinglong:2.17.9
-    container_name: qinglong
+    container_name: ql
     volumes:
-      - ./data/config:/ql/config
+      - ./qinglong/data:/ql/data
-      - ./data/log:/ql/log
+      - ./qinglong/deps/pnpm:/root/.local/share/pnpm
-      - ./data/db:/ql/db
+      - ./qinglong/deps/pip3:/usr/local/lib/python3.11/site-packages
-      - ./data/scripts:/ql/scripts
-      - ./data/repo:/ql/repo
     ports:
-      - "0.0.0.0:5500:5700"
+      - "5700:5700"
-    networks:
+    restart: unless-stopped
-      - net
-    environment:
-      - ENABLE_HANGUP=true
-      - ENABLE_WEB_PANEL=true
-    restart: always
-networks:
-    net:
 EOF
     docker-compose up -d 
     if [ $? -ne 0 ] ; then