From 3f6587089e0f15d41e6a121af55a71730fdb0ec4 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Fri, 21 May 2021 08:05:02 -0500
Subject: [PATCH] docker: rename docker-compose file.

Move the docker-compose file up to the root directory so you can just do
`docker-compose up` to bring up Danbooru.
---
 bin/danbooru                                             | 9 ++-------
 .../docker-compose.simple.yaml => docker-compose.yaml    | 6 ++++--
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename config/docker/docker-compose.simple.yaml => docker-compose.yaml (91%)

diff --git a/bin/danbooru b/bin/danbooru
index 3cf93d234..da30426db 100755
--- a/bin/danbooru
+++ b/bin/danbooru
@@ -11,7 +11,7 @@
 #
 # Alternatively, if you already have Docker installed, you can just do:
 #
-#     docker-compose -f config/docker/docker-compose.simple.yaml up
+#     docker-compose up
 #
 # This script is just a wrapper for that command.
 
@@ -51,11 +51,6 @@ start_docker() {
   fi
 }
 
-docker_compose() {
-  COMPOSE_FILE="$(dirname "$(realpath "$0")")/../config/docker/docker-compose.simple.yaml"
-  sudo docker-compose -f "$COMPOSE_FILE" "$@"
-}
-
 install_docker_compose
 start_docker
-docker_compose "${@:-up}"
+sudo docker-compose "${@:-up}"
diff --git a/config/docker/docker-compose.simple.yaml b/docker-compose.yaml
similarity index 91%
rename from config/docker/docker-compose.simple.yaml
rename to docker-compose.yaml
index 5bc6386f7..15c15d94a 100644
--- a/config/docker/docker-compose.simple.yaml
+++ b/docker-compose.yaml
@@ -1,10 +1,12 @@
 # A Docker Compose file that launches a minimal Danbooru instance. This is
 # suitable as a quick demo or for personal use, not for public-facing sites.
 #
+# This will start a Danbooru instance running on http://localhost.
+#
 # Usage:
 #
-#     $ docker-compose -f config/docker/docker-compose.simple.yaml up
-#     $ docker-compose -f config/docker/docker-compose.simple.yaml down
+#  docker-compose up
+#  docker-compose down
 #
 # References:
 #