From 9131e670f2679b9305a67f54c15bdab17b2cfd5a Mon Sep 17 00:00:00 2001
From: Paul Copplestone <pcopplestone@gmail.com>
Date: Tue, 11 May 2021 20:59:24 +0800
Subject: [PATCH] Moves the docker files back to the original location (we have
 links everywhere)

---
 .gitignore                               | 1 +
 docker/{supabase => }/.env               | 7 +++----
 docker/{supabase => }/README.md          | 5 ++---
 docker/{supabase => }/docker-compose.yml | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename docker/{supabase => }/.env (66%)
 rename docker/{supabase => }/README.md (92%)
 rename docker/{supabase => }/docker-compose.yml (96%)

diff --git a/.gitignore b/.gitignore
index dac1909874..739cd02840 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,5 +103,6 @@ typings/
 .vercel
 
 #include template .env file for docker-compose
+!docker/.env
 !docker/supabase/.env
 !docker/supabase-traefik/.env
diff --git a/docker/supabase/.env b/docker/.env
similarity index 66%
rename from docker/supabase/.env
rename to docker/.env
index d406128c93..673e4e4be1 100644
--- a/docker/supabase/.env
+++ b/docker/.env
@@ -1,10 +1,9 @@
 #fill with random passwords
-OPERATOR_TOKEN=
+OPERATOR_TOKEN=super-secret-operator-token
 
-JWT_SECRET=
+JWT_SECRET=super-secret-jwt-token-with-at-least-32-characters-long
 
-#string length 100 didnt work as password for me; length 50 did it
-POSTGRES_PASSWORD=
+POSTGRES_PASSWORD=postgres
 
 # some smtp server to send your auth-mails with
 SMTP_HOST=mail.example.com
diff --git a/docker/supabase/README.md b/docker/README.md
similarity index 92%
rename from docker/supabase/README.md
rename to docker/README.md
index 695e824270..bf27ce6c14 100644
--- a/docker/supabase/README.md
+++ b/docker/README.md
@@ -1,11 +1,10 @@
-
-## Docker
+# Supabase Docker
 
 You can run Supabase on your local machine using `docker-compose`:
 
 - Add passwords to the .env file
 
-- Starting all services: `docker-compose up -d`
+- Starting all services: `docker-compose up`
 - Stopping all services: `docker-compose down`
 
 **Usage**
diff --git a/docker/supabase/docker-compose.yml b/docker/docker-compose.yml
similarity index 96%
rename from docker/supabase/docker-compose.yml
rename to docker/docker-compose.yml
index db8bffb0d7..6a5da14d81 100644
--- a/docker/supabase/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   kong:
     container_name: supabase-kong
     build:
-      context: ../dockerfiles/kong
+      context: ./dockerfiles/kong
     environment:
       KONG_DECLARATIVE_CONFIG: /var/lib/kong/kong.yml
       KONG_PLUGINS: request-transformer,cors,key-auth,http-log
@@ -74,7 +74,7 @@ services:
   db:
     container_name: supabase-db
     build:
-      context: ../dockerfiles/postgres
+      context: ./dockerfiles/postgres
     ports:
       - ${POSTGRES_PORT}:${POSTGRES_PORT}
     command: