From 1b15b46c5744f7ad48ae1d83fd8d487863544dff Mon Sep 17 00:00:00 2001
From: sijinhui <sijinhui@qq.com>
Date: Mon, 1 Jul 2024 18:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80compose?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/dockerToHub.yml |  4 ++--
 docker-compose.yml                | 15 ---------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/dockerToHub.yml b/.github/workflows/dockerToHub.yml
index fe4a931a9..96172f8a7 100644
--- a/.github/workflows/dockerToHub.yml
+++ b/.github/workflows/dockerToHub.yml
@@ -33,7 +33,7 @@ jobs:
           #bash ./start.sh
           docker-compose build
           docker-compose push
-          yes | docker system prune --filter "until=168h"
+          #yes | docker system prune --filter "until=168h"
   download-repo:
     name: 下载仓库
     needs: build
@@ -109,7 +109,7 @@ jobs:
             echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin
             docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns
             docker-compose pull && docker-compose up -d
-            yes | docker image prune
+            #yes | docker image prune
             rm -rf /www/server/nginx/proxy_cache_dir/* || true
             rm -rf /www/server/nginx/proxy_temp_dir/* || true
             sleep 2
diff --git a/docker-compose.yml b/docker-compose.yml
index dc79ce166..dad72662d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,15 +2,11 @@ version: "3.9"
 services:
   chatgpt-next-web:
     container_name: chatgpt-next-web
-#    image: yidadaa/chatgpt-next-web
     restart: always
     image: registry.gitlab.si.icu/sijinhui/chatgpt-next-web
     build:
       context: .
       dockerfile: Dockerfile
-#    depends_on:
-#      db:
-#        condition: service_healthy
 #    ports:
 #      - "127.0.0.1:23000:23000"
     network_mode: "host"
@@ -20,14 +16,3 @@ services:
       - .env
     volumes:
       - /etc/localtime:/etc/localtime
-#    networks:
-#      - chatgpt-ns
-#    logging:
-#      driver: json-file
-#      options:
-#        max-size: "10m"
-#        max-file: "1"
-
-#networks:
-#  chatgpt-ns:
-#    external: true