From 55f2a3365141055db3a1b529d4c8c3b365f4eb2e Mon Sep 17 00:00:00 2001
From: xiangsx <1984871009@qq.com>
Date: Mon, 1 May 2023 22:47:25 +0800
Subject: Remove duplicate docker-compose.yml

---
 README.md           |  6 +-----
 docker-compose.yaml | 12 +++++++++---
 docker-compose.yml  | 12 ------------
 3 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 docker-compose.yml

diff --git a/README.md b/README.md
index 9fd505f2..75b62a8c 100644
--- a/README.md
+++ b/README.md
@@ -127,17 +127,13 @@ Run
 ```
 docker run -p 8501:8501 gpt4free:latest
 ```
-Another way - docker-compose (no docker build/run needed)
-```
-docker-compose up -d
-```
 
 ## Deploy using docker-compose
 
 Run the following:
 
 ```
-docker-compose up -d
+docker-compose up --build -d
 ```
 
 ## ChatGPT clone
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3afd6cdf..c9cc7d8f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,8 +2,14 @@ version: "3.9"
 
 services:
   gpt4free:
-    build: 
-      context: .
+    build:
+      context: ./
       dockerfile: Dockerfile
+    container_name: dc_gpt4free
+    environment:
+      # - http_proxy=http://127.0.0.1:1080
+      # - https_proxy=http://127.0.0.1:1080
+    image: img_gpt4free
     ports:
-      - "8501:8501"
+      - 8501:8501
+    restart: always
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index e8e7119b..00000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: '3.8'
-
-services:
-    gpt4:
-      build:
-        context: .
-        dockerfile: Dockerfile
-      image: gpt4free:latest
-      container_name: gpt4
-      ports: 
-        - 8501:8501
-      restart: unless-stopped
-- 
cgit v1.2.3


From 6604b3a0453b2fceb64cfbbf2a8f130f77a20b61 Mon Sep 17 00:00:00 2001
From: xiangsx <1984871009@qq.com>
Date: Mon, 1 May 2023 22:49:34 +0800
Subject: =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index c9cc7d8f..09bf4605 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -7,8 +7,8 @@ services:
       dockerfile: Dockerfile
     container_name: dc_gpt4free
     environment:
-      # - http_proxy=http://127.0.0.1:1080
-      # - https_proxy=http://127.0.0.1:1080
+      - http_proxy=http://127.0.0.1:1080
+      - https_proxy=http://127.0.0.1:1080
     image: img_gpt4free
     ports:
       - 8501:8501
-- 
cgit v1.2.3


From 7d72cf6a15f748cb7fefacad86078bd8f8ae6ba3 Mon Sep 17 00:00:00 2001
From: xiangsx <1984871009@qq.com>
Date: Mon, 1 May 2023 22:50:17 +0800
Subject: Add proxy config

---
 docker-compose.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 09bf4605..8098f359 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,9 +6,9 @@ services:
       context: ./
       dockerfile: Dockerfile
     container_name: dc_gpt4free
-    environment:
-      - http_proxy=http://127.0.0.1:1080
-      - https_proxy=http://127.0.0.1:1080
+    # environment:
+      # - http_proxy=http://127.0.0.1:1080 # modify this for your proxy
+      # - https_proxy=http://127.0.0.1:1080 # modify this for your proxy
     image: img_gpt4free
     ports:
       - 8501:8501
-- 
cgit v1.2.3