Hujiarui пре 2 месеци
родитељ
комит
11df633a77
2 измењених фајлова са 26 додато и 21 уклоњено
  1. 8 3
      Dockerfile
  2. 18 18
      docker-compose.yml

+ 8 - 3
Dockerfile

@@ -46,10 +46,15 @@ RUN dbus-uuidgen > /var/lib/dbus/machine-id
 WORKDIR /app
 
 # 复制并解压 chromium
-COPY downloads/ungoogled-chromium-144.0.7559.132-1-x86_64_linux.tar.xz /tmp/chrome.tar.xz
+# COPY downloads/ungoogled-chromium-144.0.7559.132-1-x86_64_linux.tar.xz /tmp/chrome.tar.xz
+# RUN mkdir -p /opt/ungoogled-chromium && \
+#     tar -xJf /tmp/chrome.tar.xz -C /opt/ungoogled-chromium --strip-components=1 && \
+#     rm /tmp/chrome.tar.xz
+
+COPY downloads/cloakbrowser-linux-x64.tar.gz /tmp/chrome.tar.gz
 RUN mkdir -p /opt/ungoogled-chromium && \
-    tar -xJf /tmp/chrome.tar.xz -C /opt/ungoogled-chromium --strip-components=1 && \
-    rm /tmp/chrome.tar.xz
+    tar -zxf /tmp/chrome.tar.gz -C /opt/ungoogled-chromium && \
+    rm /tmp/chrome.tar.gz
 
 # 复制并解压 mihomo
 COPY downloads/mihomo-linux-amd64.gz /tmp/mihomo.gz

+ 18 - 18
docker-compose.yml

@@ -5,7 +5,7 @@ services:
     build: .
     image: coordinator:latest
     container_name: coordinator-sentinel
-    command: ["python3", "main_sentinel.py", "--config", "config/config.json"]
+    command: ["python3", "main_sentinel.py"]
     restart: unless-stopped
     shm_size: '2gb'
     volumes:
@@ -22,13 +22,13 @@ services:
       resources:
         limits:
           cpus: '2.0'
-          memory: 6G
+          memory: 2G
 
   visa-booker:
     build: .
     image: coordinator:latest
     container_name: coordinator-booker
-    command: ["python3", "main_booker.py", "--config", "config/config.json"]
+    command: ["python3", "main_booker.py"]
     restart: unless-stopped
     shm_size: '2gb'
     volumes:
@@ -45,7 +45,7 @@ services:
       resources:
         limits:
           cpus: '2.0'
-          memory: 4G
+          memory: 2G
 
   visa-sweeper:
     build: .
@@ -65,17 +65,17 @@ services:
           cpus: '0.2'
           memory: 256M
 
-  registration-bot:
-    build: .
-    image: coordinator:latest
-    container_name: tls-bot-worker
-    environment:
-      - CAPSOLVER_KEY=CAP-5441DD341DD3CC2FAEF0BE6FE493EE9A
-    command: ["python3", "-u" ,"tls_registration_bot.py", "-n", "1", "-m", "50", "-p", "isp_all", "-u", "https://visas-fr.tlscontact.com/en-us/country/gb/vac/gbLON2fr"]
-    volumes:
-      - ./config:/app/config
-      - ./data:/app/data
-    deploy:
-      resources:
-        limits:
-          memory: 2G
+  # registration-bot:
+  #   build: .
+  #   image: coordinator:latest
+  #   container_name: tls-bot-worker
+  #   environment:
+  #     - CAPSOLVER_KEY=CAP-5441DD341DD3CC2FAEF0BE6FE493EE9A
+  #   command: ["python3", "-u" ,"tls_registration_bot.py", "-n", "1", "-m", "50", "-p", "isp_all", "-u", "https://visas-fr.tlscontact.com/en-us/country/gb/vac/gbLON2fr"]
+  #   volumes:
+  #     - ./config:/app/config
+  #     - ./data:/app/data
+  #   deploy:
+  #     resources:
+  #       limits:
+  #         memory: 2G