From cd012683057af51529e2a8d8d2b1b00f0a814d65 Mon Sep 17 00:00:00 2001
From: Kohei Watanabe <kou029w@gmail.com>
Date: Tue, 23 Aug 2022 12:54:45 +0900
Subject: [PATCH] move compose.yml to root

---
 db/.gitignore => .gitignore   |  0
 app/.gitignore                |  1 -
 app/compose.yml               | 10 ----------
 db/compose.yml => compose.yml | 11 ++++++++++-
 4 files changed, 10 insertions(+), 12 deletions(-)
 rename db/.gitignore => .gitignore (100%)
 delete mode 100644 app/compose.yml
 rename db/compose.yml => compose.yml (83%)

diff --git a/db/.gitignore b/.gitignore
similarity index 100%
rename from db/.gitignore
rename to .gitignore
diff --git a/app/.gitignore b/app/.gitignore
index 6ed48a9..3c3629e 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,2 +1 @@
-.env
 node_modules
diff --git a/app/compose.yml b/app/compose.yml
deleted file mode 100644
index c713e06..0000000
--- a/app/compose.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-services:
-  app:
-    image: kou029w/quot-app
-    build: "."
-    restart: unless-stopped
-    init: true
-    user: ${UID:-1000}:${GID:-1000}
-    ports: ["8080:8080"]
-    volumes:
-      - ".:/app"
diff --git a/db/compose.yml b/compose.yml
similarity index 83%
rename from db/compose.yml
rename to compose.yml
index d163993..87fc163 100644
--- a/db/compose.yml
+++ b/compose.yml
@@ -1,4 +1,13 @@
 services:
+  app:
+    image: kou029w/quot-app
+    build: app
+    restart: unless-stopped
+    init: true
+    user: ${UID:-1000}:${GID:-1000}
+    ports: ["8080:8080"]
+    volumes:
+      - ./app:/app
   api:
     image: postgrest/postgrest:v10.0.0
     restart: unless-stopped
@@ -19,7 +28,7 @@ services:
     environment:
       DATABASE_URL: postgresql://postgres:${POSTGRES_PASSWORD}@/postgres?host=/var/run/postgresql
     volumes:
-      - .:/db
+      - ./db:/db
       - postgres_socket:/var/run/postgresql
     depends_on: [db]
   db: