From b860dbd9a6d36f645a5406076d9d30ecf33bbad2 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Sat, 27 Aug 2022 14:14:24 +0530
Subject: [PATCH] Revert to using docker-compose commands, since ./server
 wasn't working reliably on some platforms

---
 README.md        |  6 +++---
 old_port_main.py |  2 --
 server           | 25 +------------------------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index b52a036c..d374dc92 100644
--- a/README.md
+++ b/README.md
@@ -27,15 +27,15 @@ All the processing will happen on your computer locally, it does not transmit yo
 
 # Installation
 1. Clone this repository: `git clone https://github.com/cmdr2/stable-diffusion-ui.git` or [download the zip file](https://github.com/cmdr2/stable-diffusion-ui/archive/refs/heads/main.zip) and unzip.
-2. Open your terminal, and in the project directory run: `./server` (warning: this will take some time during the first run, since it'll download Stable Diffusion's [docker image](https://replicate.com/stability-ai/stable-diffusion), nearly 17 GiB)
+2. Open your terminal, and in the project directory run: `docker-compose up &` (warning: this will take some time during the first run, since it'll download Stable Diffusion's [docker image](https://replicate.com/stability-ai/stable-diffusion), nearly 17 GiB)
 3. Open http://localhost:9000 in your browser. That's it!
 
 If you're getting errors, please check the [Troubleshooting](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting) page.
 
-To stop the server, please run `./server stop`
+To stop the server, please run `docker-compose down`
 
 # Usage
-Open http://localhost:9000 in your browser (after running `./server` from step 2 previously).
+Open http://localhost:9000 in your browser (after running `docker-compose up &` from step 2 previously).
 
 ## With a text description
 1. Enter a text prompt, like `a photograph of an astronaut riding a horse` in the textbox.
diff --git a/old_port_main.py b/old_port_main.py
index 49c95adf..432ea847 100644
--- a/old_port_main.py
+++ b/old_port_main.py
@@ -30,8 +30,6 @@ def read_root():
     </style>
     <h4>The UI has moved to <a href="http://localhost:9000">http://localhost:9000</a>. The current address that you used (ending with :8000) will be removed in the future, so please use <a href="http://localhost:9000">http://localhost:9000</a> going ahead (and in any bookmarks you've saved).</h4>
 
-    <h4>Also, please use <pre>./server</pre> instead of <pre>docker-compose up &amp;</pre>. To stop, please use <pre>./server stop</pre>. This will help the project better manage the startup process in the future.</h4>
-
     <h3>Why has the address changed?</h3>
     <p>The previously used port (8000) is often used by other servers, which results in port conflicts. So the project's port number has been changed, while the project is still young. Otherwise port-conflicts with 8000 will be a common source of new-user issues in the future.</p>
     <p>Sorry about this, and apologies for the inconvenience :)</p>
diff --git a/server b/server
index ce7a5a62..849154b4 100755
--- a/server
+++ b/server
@@ -1,26 +1,3 @@
 #!/bin/bash
 
-CMD="$1"
-if [ -z "$1" ]; then
-  CMD="start"
-fi
-
-start_server() {
-  docker-compose up -d stable-diffusion-old-port-redirect # old port 8000 server, show redirect notice
-  docker-compose up stability-ai stable-diffusion-ui
-}
-
-stop_server() {
-  docker-compose down
-}
-
-if [ "$CMD" == "start" ]; then
-  start_server
-elif [ "$CMD" == "stop" ]; then
-  stop_server
-elif [ "$CMD" == "restart" ]; then
-  stop_server
-  start_server
-else
-  echo "Unknown option: $1 (Expected start or stop)"
-fi
\ No newline at end of file
+echo "Please use 'docker-compose up &' to start the server, and 'docker-compose down' to stop the server"
\ No newline at end of file